]> err.no Git - linux-2.6/commitdiff
libata: handle ata_pci_device_do_resume() failure while resuming
authorDmitriy Monakhov <dmonakhov@sw.ru>
Tue, 6 Mar 2007 10:37:54 +0000 (02:37 -0800)
committerJeff Garzik <jeff@garzik.org>
Sat, 28 Apr 2007 18:15:55 +0000 (14:15 -0400)
Since commit:553c4aa630af7bc885e056d0436e4eb7f238579b
ata_pci_device_do_resume() can return error code, all callers was updated
except this one.

Signed-off-by: Monakhov Dmitriy <dmonakhov@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/ata/sata_inic162x.c

index 4f5a6a1fb0edb87452e8f3eff098d21f7745bf73..11c3079ab6cc20ed8ff0c4b85493147bdc764923 100644 (file)
@@ -642,7 +642,9 @@ static int inic_pci_device_resume(struct pci_dev *pdev)
        void __iomem *mmio_base = host->iomap[MMIO_BAR];
        int rc;
 
-       ata_pci_device_do_resume(pdev);
+       rc = ata_pci_device_do_resume(pdev);
+       if (rc)
+               return rc;
 
        if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
                rc = init_controller(mmio_base, hpriv->cached_hctl);