Merge with upstream to accommodate with thermal changes

[deliverable/linux.git] / drivers / scsi / scsi_pm.c

diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index f661a41fa4c6fef7e054ed15dd1b73596bc99691..d4201ded3b2203c0bd9cc17d8a26b528f5ccfc2c 100644 (file)
--- a/drivers/scsi/scsi_pm.c
+++ b/drivers/scsi/scsi_pm.c
@@ -24,8 +24,11 @@ static int scsi_dev_type_suspend(struct device *dev, pm_message_t msg)
        err = scsi_device_quiesce(to_scsi_device(dev));
        if (err == 0) {
                drv = dev->driver;
-               if (drv && drv->suspend)
+               if (drv && drv->suspend) {
                        err = drv->suspend(dev, msg);
+                       if (err)
+                               scsi_device_resume(to_scsi_device(dev));
+               }
        }
        dev_dbg(dev, "scsi suspend: %d\n", err);
        return err;