1 files changed, 13 insertions, 1 deletions

diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 511a830b6256..3814aebefb2d 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -637,6 +637,11 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         const struct ata_port_info *ppi[] = { NULL, NULL };
         u8 tmp;
         struct pci_dev *isa_bridge;
+        int rc;
+
+        rc = pcim_enable_device(pdev);
+        if (rc)
+                return rc;
 
         /*
          * The chipset revision selects the driver operations and
@@ -672,8 +677,15 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 #ifdef CONFIG_PM
 static int ali_reinit_one(struct pci_dev *pdev)
 {
+        struct ata_host *host = dev_get_drvdata(&pdev->dev);
+        int rc;
+
+        rc = ata_pci_device_do_resume(pdev);
+        if (rc)
+                return rc;
         ali_init_chipset(pdev);
-        return ata_pci_device_resume(pdev);
+        ata_host_resume(host);
+        return 0;
 }
 #endif