1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 29e71bddd6ff..6dd12f7019a0 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1932,7 +1932,7 @@ static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
         void __iomem *mmio = host->iomap[AHCI_PCI_BAR];
         u32 ctl;
 
-        if (mesg.event == PM_EVENT_SUSPEND) {
+        if (mesg.event & PM_EVENT_SLEEP) {
                 /* AHCI spec rev1.1 section 8.3.3:
                  * Software must disable interrupts prior to requesting a
                  * transition of the HBA to D3 state.
@@ -1975,16 +1975,11 @@ static int ahci_port_start(struct ata_port *ap)
         struct ahci_port_priv *pp;
         void *mem;
         dma_addr_t mem_dma;
-        int rc;
 
         pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
         if (!pp)
                 return -ENOMEM;
 
-        rc = ata_pad_alloc(ap, dev);
-        if (rc)
-                return rc;
-
         mem = dmam_alloc_coherent(dev, AHCI_PORT_PRIV_DMA_SZ, &mem_dma,
                                   GFP_KERNEL);
         if (!mem)