| From a91c1be21704113b023919826c6d531da46656ef Mon Sep 17 00:00:00 2001 |
| From: James Bottomley <James.Bottomley@suse.de> |
| Date: Fri, 12 Mar 2010 16:14:42 -0600 |
| Subject: SCSI: enclosure: fix error path - actually return ERR_PTR() on error |
| |
| From: James Bottomley <James.Bottomley@suse.de> |
| |
| commit a91c1be21704113b023919826c6d531da46656ef upstream. |
| |
| we also need to clean up and free the cdev. |
| |
| Reported-by: Jani Nikula <ext-jani.1.nikula@nokia.com> |
| Signed-off-by: James Bottomley <James.Bottomley@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/misc/enclosure.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/misc/enclosure.c |
| +++ b/drivers/misc/enclosure.c |
| @@ -264,8 +264,11 @@ enclosure_component_register(struct encl |
| 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; |
| } |
