summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 00:21:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 00:21:02 -0700
commit6d87f207c04370681b9a710b8dbed0f567491e49 (patch)
treeb6ca4ab9f7358f2ec8088fbadcb5f078a9c022f2 /drivers
parentd20de763548f9948f4534fc816155d8ee48e1d35 (diff)
parentf6e6e7799ebcad40fa15e4015beca2d776554302 (diff)
downloadlinux-6d87f207c04370681b9a710b8dbed0f567491e49.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: kobject_uevent: fix typo in comments firmware_class: fix typo in error path kobject: Break the kobject namespace defs into their own header
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/firmware_class.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index c8a44f5e0584..40af43ebd92d 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;