diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-08-18 17:15:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-23 18:12:46 -0700 |
| commit | f45f3c1f3f616ca1d1e1eb5e7a720ca63cb59550 (patch) | |
| tree | 86377f566006497bb55aa4dac3c05e49c632688d /drivers | |
| parent | 8488a38f4d2f43bd55a3e0db4cd57a5bef3af6d6 (diff) | |
| download | linux-3.10-f45f3c1f3f616ca1d1e1eb5e7a720ca63cb59550.tar.gz linux-3.10-f45f3c1f3f616ca1d1e1eb5e7a720ca63cb59550.tar.bz2 linux-3.10-f45f3c1f3f616ca1d1e1eb5e7a720ca63cb59550.zip | |
firmware_class: fix typo in error path
In the error path, _request_firmware sets
firmware_p to NULL rather than *firmware_p,
which leads to passing a freed firmware
struct to drivers when the firmware file
cannot be found. Fix this.
Broken by commit f8a4bd3456b988fc73b2c.
Reported-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/firmware_class.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index c8a44f5e058..40af43ebd92 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -568,7 +568,7 @@ static int _request_firmware(const struct firmware **firmware_p, out: if (retval) { release_firmware(firmware); - firmware_p = NULL; + *firmware_p = NULL; } return retval; |