scsi: sd: Fix system start for ATA devices

[platform/kernel/linux-rpi.git] / drivers / ata / libata-scsi.c

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 87fe8a8..4209fb3 100644 (file)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1055,9 +1055,14 @@ int ata_scsi_dev_config(struct scsi_device *sdev, struct ata_device *dev)
                 * Ask the sd driver to issue START STOP UNIT on runtime suspend
                 * and resume and shutdown only. For system level suspend/resume,
                 * devices power state is handled directly by libata EH.
+                * Given that disks are always spun up on system resume, also
+                * make sure that the sd driver forces runtime suspended disks
+                * to be resumed to correctly reflect the power state of the
+                * device.
                 */
                sdev->manage_runtime_start_stop = 1;
                sdev->manage_shutdown = 1;
+               sdev->force_runtime_start_on_system_start = 1;
        }
 
        /*