2 files changed, 6 insertions, 0 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 01cefbb2d539..d53312c42547 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1124,6 +1124,8 @@ sd_spinup_disk(struct scsi_disk *sdkp)
                                 cmd[1] = 1;     /* Return immediately */
                                 memset((void *) &cmd[2], 0, 8);
                                 cmd[4] = 1;     /* Start spin cycle */
+                                if (sdkp->device->start_stop_pwr_cond)
+                                        cmd[4] |= 1 << 4;
                                 scsi_execute_req(sdkp->device, cmd, DMA_NONE,
                                                  NULL, 0, &sshdr,
                                                  SD_TIMEOUT, SD_MAX_RETRIES);
@@ -1790,6 +1792,9 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start)
         if (start)
                 cmd[4] |= 1;    /* START */
 
+        if (sdp->start_stop_pwr_cond)
+                cmd[4] |= start ? 1 << 4 : 3 << 4;      /* Active or Standby */
+
         if (!scsi_device_online(sdp))
                 return -ENODEV;
 
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index f6a9fe0ef09c..00b78763a1bf 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -134,6 +134,7 @@ struct scsi_device {
         unsigned no_start_on_add:1;     /* do not issue start on add */
         unsigned allow_restart:1; /* issue START_UNIT in error handler */
         unsigned manage_start_stop:1;   /* Let HLD (sd) manage start/stop */
+        unsigned start_stop_pwr_cond:1; /* Set power cond. in START_STOP_UNIT */
         unsigned no_uld_attach:1; /* disable connecting to upper level drivers */
         unsigned select_no_atn:1;
         unsigned fix_capacity:1;        /* READ_CAPACITY is too high by 1 */