5 files changed, 9 insertions, 8 deletions

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 6970f6867334..d8f77f2a5af1 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -4336,14 +4336,15 @@ int ata_device_resume(struct ata_port *ap, struct ata_device *dev)
  *      Flush the cache on the drive, if appropriate, then issue a
  *      standbynow command.
  */
-int ata_device_suspend(struct ata_port *ap, struct ata_device *dev)
+int ata_device_suspend(struct ata_port *ap, struct ata_device *dev, pm_message_t state)
 {
         if (!ata_dev_present(dev))
                 return 0;
         if (dev->class == ATA_DEV_ATA)
                 ata_flush_cache(ap, dev);
 
-        ata_standby_drive(ap, dev);
+        if (state.event != PM_EVENT_FREEZE)
+                ata_standby_drive(ap, dev);
         ap->flags |= ATA_FLAG_SUSPENDED;
         return 0;
 }
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index a1259b242b8e..1fd3826da97e 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -414,12 +414,12 @@ int ata_scsi_device_resume(struct scsi_device *sdev)
         return ata_device_resume(ap, dev);
 }
 
-int ata_scsi_device_suspend(struct scsi_device *sdev)
+int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)
 {
         struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0];
         struct ata_device *dev = &ap->device[sdev->id];
 
-        return ata_device_suspend(ap, dev);
+        return ata_device_suspend(ap, dev, state);
 }
 
 /**
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 89055494dfee..a6fde52946d6 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -286,7 +286,7 @@ static int scsi_bus_suspend(struct device * dev, pm_message_t state)
                 return err;
 
         if (sht->suspend)
-                err = sht->suspend(sdev);
+                err = sht->suspend(sdev, state);
 
         return err;
 }
diff --git a/include/linux/libata.h b/include/linux/libata.h
index fbe8ba212598..c52f13498556 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -520,9 +520,9 @@ extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
 extern int ata_scsi_release(struct Scsi_Host *host);
 extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
 extern int ata_scsi_device_resume(struct scsi_device *);
-extern int ata_scsi_device_suspend(struct scsi_device *);
+extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t state);
 extern int ata_device_resume(struct ata_port *, struct ata_device *);
-extern int ata_device_suspend(struct ata_port *, struct ata_device *);
+extern int ata_device_suspend(struct ata_port *, struct ata_device *, pm_message_t state);
 extern int ata_ratelimit(void);
 extern unsigned int ata_busy_sleep(struct ata_port *ap,
                                    unsigned long timeout_pat,
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index a6cf3e535c0b..dc6862d09e53 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -286,7 +286,7 @@ struct scsi_host_template {
          * suspend support
          */
         int (*resume)(struct scsi_device *);
-        int (*suspend)(struct scsi_device *);
+        int (*suspend)(struct scsi_device *, pm_message_t state);
 
         /*
          * Name of proc directory