From 05dd57cec601ed812620788549383399b9bb9efb Mon Sep 17 00:00:00 2001
From: Lin Ming <ming.m.lin@intel.com>
Date: Mon, 5 Dec 2011 09:20:26 +0800
Subject: [PATCH] --- yaml --- r: 282111 b: refs/heads/master c:
 54f57588463db1105f4a93b2902a6f95cb8f796a h: refs/heads/master i:   282109:
 c9b5e366093e549542b5ad72d3e739fe64508b08   282107:
 8b00db53032de86f0a5fc0f400b97a56b5da8505   282103:
 ea4a2d25be4387fe2c193c50058bfe07c39f6dad   282095:
 14752cc86b5629890e543ec0c9543e6a634000f8   282079:
 790d5048de9cad8f1d3665492b3d300ec8efda09   282047:
 a5296133212c9909abadaf98babde73b8a10d838   281983:
 1d8411c930149aca4fc1d632fef306d78a958265   281855:
 96046defd95756488f9ee7f54a6aa8959a4ab95a   281599:
 76c2e7f48708891db2f81abd0b3e8e7ccd2b4169 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/scsi/sd.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 895b98cae06a..5770a8b10201 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 286405167e815adc4ae0132214246a350b0208bc
+refs/heads/master: 54f57588463db1105f4a93b2902a6f95cb8f796a
diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c
index fa3a5918009c..7b3f8075e2a5 100644
--- a/trunk/drivers/scsi/sd.c
+++ b/trunk/drivers/scsi/sd.c
@@ -50,6 +50,7 @@
 #include <linux/string_helpers.h>
 #include <linux/async.h>
 #include <linux/slab.h>
+#include <linux/pm_runtime.h>
 #include <asm/uaccess.h>
 #include <asm/unaligned.h>
 
@@ -2741,6 +2742,9 @@ static void sd_shutdown(struct device *dev)
 	if (!sdkp)
 		return;         /* this can happen */
 
+	if (pm_runtime_suspended(dev))
+		goto exit;
+
 	if (sdkp->WCE) {
 		sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n");
 		sd_sync_cache(sdkp);
@@ -2751,6 +2755,7 @@ static void sd_shutdown(struct device *dev)
 		sd_start_stop_device(sdkp, 0);
 	}
 
+exit:
 	scsi_disk_put(sdkp);
 }