mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-15 21:30:43 +00:00
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: <stable@vger.kernel.org> Signed-off-by: Maurizio Lombardi <mlombard@redhat.com> Tested-by: Douglas Miller <dougmill@linux.vnet.ibm.com> Acked-by: James Bottomley <jejb@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
8dc0da7981
commit
62e62ffd95
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user