---

yaml --- r: 309625 b: refs/heads/master c: d20ec59 h: refs/heads/master i: 309623: 268175d v: v3
git-mirror · May 22, 2012 · a2ae402 · a2ae402
1 parent d46bb69
commit a2ae402
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6192bd7cdc37e2df9391403235b72668a5bf27da
+refs/heads/master: d20ec597cba1e8ea407c9a7c668a9e04fc057c83
diff --git a/trunk/drivers/scsi/scsi_pm.c b/trunk/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;