2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 07b5a3d4ed21..b6a1de8fad5b 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -967,6 +967,7 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc)
                  * for more info.
                  */
                 if (ata_spindown_compat &&
+                    (qc->dev->flags & ATA_DFLAG_SPUNDOWN) &&
                     (system_state == SYSTEM_HALT ||
                      system_state == SYSTEM_POWER_OFF)) {
                         static unsigned long warned = 0;
@@ -1394,6 +1395,14 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
                 }
         }
 
+        /* XXX: track spindown state for spindown_compat */
+        if (unlikely(qc->tf.command == ATA_CMD_STANDBY ||
+                     qc->tf.command == ATA_CMD_STANDBYNOW1))
+                qc->dev->flags |= ATA_DFLAG_SPUNDOWN;
+        else if (likely(system_state != SYSTEM_HALT &&
+                        system_state != SYSTEM_POWER_OFF))
+                qc->dev->flags &= ~ATA_DFLAG_SPUNDOWN;
+
         if (need_sense && !ap->ops->error_handler)
                 ata_dump_status(ap->print_id, &qc->result_tf);
 
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 9b2122db30ff..666592ef0b25 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -140,6 +140,7 @@ enum {
 
         ATA_DFLAG_PIO           = (1 << 8), /* device limited to PIO mode */
         ATA_DFLAG_NCQ_OFF       = (1 << 9), /* device limited to non-NCQ mode */
+        ATA_DFLAG_SPUNDOWN      = (1 << 10), /* XXX: for spindown_compat */
         ATA_DFLAG_INIT_MASK     = (1 << 16) - 1,
 
         ATA_DFLAG_DETACH        = (1 << 16),