From a2ae4028f5eef5fba2dd781a7249b2501dd11a42 Mon Sep 17 00:00:00 2001
From: Aaron Lu <aaron.lu@amd.com>
Date: Tue, 15 May 2012 14:43:00 +0800
Subject: [PATCH] --- yaml --- r: 309625 b: refs/heads/master c:
 d20ec597cba1e8ea407c9a7c668a9e04fc057c83 h: refs/heads/master i:   309623:
 268175d6f720bf0f59376fc17d8c87cfa55feadb v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/scsi/scsi_pm.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b367ec3fe6f5..692d5edcea20 100644
--- 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
index f661a41fa4c6..d4201ded3b22 100644
--- 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;