diff options
author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2008-09-03 12:26:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-16 12:24:49 -0400 |
commit | 286661b3777897220ecfcd774bccc68a34667f39 (patch) | |
tree | f8f456ee144eab991f1c7569c1f44cb9a220bccc /drivers/base | |
parent | 5739411acbaa63a6c22c91e340fdcdbcc7d82a51 (diff) |
Driver core: Fix cleanup in device_create_vargs().
If device_register() in device_create_vargs() fails, the device
must be cleaned up with put_device() (which is also fine on NULL)
instead of kfree().
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index aac91e89d6af..9649d1c422a4 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -1256,7 +1256,7 @@ struct device *device_create_vargs(struct class *class, struct device *parent, | |||
1256 | return dev; | 1256 | return dev; |
1257 | 1257 | ||
1258 | error: | 1258 | error: |
1259 | kfree(dev); | 1259 | put_device(dev); |
1260 | return ERR_PTR(retval); | 1260 | return ERR_PTR(retval); |
1261 | } | 1261 | } |
1262 | EXPORT_SYMBOL_GPL(device_create_vargs); | 1262 | EXPORT_SYMBOL_GPL(device_create_vargs); |