1 files changed, 11 insertions, 7 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index f071b9edaf36..448d316f12d7 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1789,7 +1789,7 @@ static void sd_shutdown(struct device *dev)
 static int sd_suspend(struct device *dev, pm_message_t mesg)
 {
         struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
-        int ret;
+        int ret = 0;
 
         if (!sdkp)
                 return 0;       /* this can happen */
@@ -1798,30 +1798,34 @@ static int sd_suspend(struct device *dev, pm_message_t mesg)
                 sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n");
                 ret = sd_sync_cache(sdkp);
                 if (ret)
-                        return ret;
+                        goto done;
         }
 
         if (mesg.event == PM_EVENT_SUSPEND &&
             sdkp->device->manage_start_stop) {
                 sd_printk(KERN_NOTICE, sdkp, "Stopping disk\n");
                 ret = sd_start_stop_device(sdkp, 0);
-                if (ret)
-                        return ret;
         }
 
-        return 0;
+done:
+        scsi_disk_put(sdkp);
+        return ret;
 }
 
 static int sd_resume(struct device *dev)
 {
         struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
+        int ret = 0;
 
         if (!sdkp->device->manage_start_stop)
-                return 0;
+                goto done;
 
         sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
+        ret = sd_start_stop_device(sdkp, 1);
 
-        return sd_start_stop_device(sdkp, 1);
+done:
+        scsi_disk_put(sdkp);
+        return ret;
 }
 
 /**