diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2010-03-12 16:14:42 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-27 12:03:48 -0500 |
| commit | a91c1be21704113b023919826c6d531da46656ef (patch) | |
| tree | 5ac2396f83dcfbf8596d5f5cfa11d4cd5f6cc118 /drivers/misc/enclosure.c | |
| parent | aac3118d33e275a7b1134cb19227c982f4d43877 (diff) | |
| download | kernel_samsung_smdk4412-a91c1be21704113b023919826c6d531da46656ef.tar.gz kernel_samsung_smdk4412-a91c1be21704113b023919826c6d531da46656ef.tar.bz2 kernel_samsung_smdk4412-a91c1be21704113b023919826c6d531da46656ef.zip | |
[SCSI] enclosure: fix error path - actually return ERR_PTR() on error
we also need to clean up and free the cdev.
Reported-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Cc: Stable Tree <stable@kernel.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/misc/enclosure.c')
| -rw-r--r-- | drivers/misc/enclosure.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c index 48c84a58163..00e5fcac8fd 100644 --- a/drivers/misc/enclosure.c +++ b/drivers/misc/enclosure.c @@ -285,8 +285,11 @@ enclosure_component_register(struct enclosure_device *edev, cdev->groups = enclosure_groups; err = device_register(cdev); - if (err) - ERR_PTR(err); + if (err) { + ecomp->number = -1; + put_device(cdev); + return ERR_PTR(err); + } return ecomp; } |