[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 1/9] scsi/sd: add error handling support for add_disk()

We never checked for errors on add_disk() as this function
returned void. Now that this is fixed, use the shiny new
error handling.

As with the error handling for device_add() we follow the same
logic and just put the device so that cleanup is done via the

Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Luis Chamberlain <mcgrof@xxxxxxxxxx>
 drivers/scsi/sd.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a646d27df681..d69f2e626e76 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3457,7 +3457,13 @@ static int sd_probe(struct device *dev)
-       device_add_disk(dev, gd, NULL);
+       error = device_add_disk(dev, gd, NULL);
+       if (error) {
+               put_device(&sdkp->dev);
+               goto out;
+       }
        if (sdkp->capacity)



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.