diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index c5a189c50286d1c1537a842ffe6f403a49951295..b1195fd537b6fdb24cce9952ad9de4ccf98a1011 100644
--- a/drivers/scsi/sd.c
+++ b/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);
 	}