scsi: sd: Add error handling support for add_disk()

[sfrench/cifs-2.6.git] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 8b19d7cb5e96a58c8f71cef71714b52daf00c3ef..1ba83a892976df4467592d9547a29b73fb5da853 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3457,7 +3457,13 @@ static int sd_probe(struct device *dev)
                pm_runtime_set_autosuspend_delay(dev,
                        sdp->host->hostt->rpm_autosuspend_delay);
        }
-       device_add_disk(dev, gd, NULL);
+
+       error = device_add_disk(dev, gd, NULL);
+       if (error) {
+               put_device(&sdkp->dev);
+               goto out;
+       }
+
        if (sdkp->capacity)
                sd_dif_config_host(sdkp);