SCSI: enclosure: fix error path - actually return ERR_PTR() on error

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>

diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index 1eac626e710a38dddab8673b1cc5f751a1df7366..68e4cd7d321ac7715a5bf47420ce1bc0c4bc8639 100644 (file)
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -284,8 +284,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;
 }