From: James Bottomley <James.Bottomley@suse.de>
Date: Fri, 12 Mar 2010 22:14:42 +0000 (-0600)
Subject: SCSI: enclosure: fix error path - actually return ERR_PTR() on error
X-Git-Tag: v2.6.35.1~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=efe5d7f1ad582cafc68624f39ba720e12bcddb20;p=karo-tx-linux.git

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 48c84a58163e..00e5fcac8fdf 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;
 }