---

yaml --- r: 343732 b: refs/heads/master c: a014756 h: refs/heads/master v: v3
git-mirror · Nov 30, 2012 · 864c397 · 864c397
1 parent 9ee71a8
commit 864c397
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: beecadea1b8d67f591b13f7099559f32f3fd601d
+refs/heads/master: a01475637c70a4a484dd315a90bf2df518f07705
diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c
@@ -3069,7 +3069,8 @@ static int sd_suspend(struct device *dev, pm_message_t mesg)
 			goto done;
 	}
 
-	if ((mesg.event & PM_EVENT_SLEEP) && sdkp->device->manage_start_stop) {
+	if (((mesg.event & PM_EVENT_SLEEP) || PMSG_IS_AUTO(mesg)) &&
+			sdkp->device->manage_start_stop) {
 		sd_printk(KERN_NOTICE, sdkp, "Stopping disk\n");
 		ret = sd_start_stop_device(sdkp, 0);
 	}