---

yaml --- r: 282111 b: refs/heads/master c: 54f5758 h: refs/heads/master i: 282109: c9b5e36 282107: 8b00db5 282103: ea4a2d2 282095: 14752cc 282079: 790d504 282047: a529613 281983: 1d8411c 281855: 96046de 281599: 76c2e7f v: v3
git-mirror · Jan 9, 2012 · 05dd57c · 05dd57c
1 parent 56fd18e
commit 05dd57c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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);
 }