4 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 4150c8a8fdc2..dfaaae5e73ae 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -89,7 +89,7 @@ ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
         pci_save_state(pdev);
         pci_disable_device(pdev);
 
-        if (mesg.event == PM_EVENT_SUSPEND)
+        if (mesg.event & PM_EVENT_SLEEP)
                 pci_set_power_state(pdev, PCI_D3hot);
 
         return rc;
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index dd6e21d6f1dd..3d3eaef65fb3 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -134,7 +134,7 @@ ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
         pci_save_state(pdev);
         pci_disable_device(pdev);
 
-        if (mesg.event == PM_EVENT_SUSPEND)
+        if (mesg.event & PM_EVENT_SLEEP)
                 pci_set_power_state(pdev, PCI_D3hot);
 
         return rc;
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index 651d09b08f2a..fd63b06d9ef1 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1759,6 +1759,7 @@ static int mesh_suspend(struct macio_dev *mdev, pm_message_t mesg)
 
         switch (mesg.event) {
         case PM_EVENT_SUSPEND:
+        case PM_EVENT_HIBERNATE:
         case PM_EVENT_FREEZE:
                 break;
         default:
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 37df8bbe7f46..7aee64dbfbeb 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1835,8 +1835,7 @@ static int sd_suspend(struct device *dev, pm_message_t mesg)
                         goto done;
         }
 
-        if (mesg.event == PM_EVENT_SUSPEND &&
-            sdkp->device->manage_start_stop) {
+        if ((mesg.event & PM_EVENT_SLEEP) && sdkp->device->manage_start_stop) {
                 sd_printk(KERN_NOTICE, sdkp, "Stopping disk\n");
                 ret = sd_start_stop_device(sdkp, 0);
         }