scsi: ses: do not add a device to an enclosure if enclosure_add_links…

…() fails. The enclosure_add_device() function should fail if it can't create the relevant sysfs links. Cc: <[email protected]> Signed-off-by: Maurizio Lombardi <[email protected]> Tested-by: Douglas Miller <[email protected]> Acked-by: James Bottomley <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
anholt · Jul 1, 2017 · 62e62ff · 62e62ff
1 parent 8dc0da7
commit 62e62ff
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
@@ -375,6 +375,7 @@ int enclosure_add_device(struct enclosure_device *edev, int component,
 			 struct device *dev)
 {
 	struct enclosure_component *cdev;
+	int err;
 
 	if (!edev || component >= edev->components)
 		return -EINVAL;
@@ -384,12 +385,17 @@ int enclosure_add_device(struct enclosure_device *edev, int component,
 	if (cdev->dev == dev)
 		return -EEXIST;
 
-	if (cdev->dev)
+	if (cdev->dev) {
 		enclosure_remove_links(cdev);
-
-	put_device(cdev->dev);
+		put_device(cdev->dev);
+	}
 	cdev->dev = get_device(dev);
-	return enclosure_add_links(cdev);
+	err = enclosure_add_links(cdev);
+	if (err) {
+		put_device(cdev->dev);
+		cdev->dev = NULL;
+	}
+	return err;
 }
 EXPORT_SYMBOL_GPL(enclosure_add_device);