diff options
author | Dmitriy Monakhov <dmonakhov@sw.ru> | 2007-03-06 05:37:54 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 14:15:55 -0400 |
commit | 5aea408df5ae459cb29b91d45fa0f8bc1bee924e (patch) | |
tree | 064df4a15ca4fc4c80c6b8f0ed95d59067db9b16 /drivers | |
parent | 8343f88999bfcf4c4169e964c8a5c040f40c5a77 (diff) |
libata: handle ata_pci_device_do_resume() failure while resuming
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/sata_inic162x.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c index 4f5a6a1fb0ed..11c3079ab6cc 100644 --- a/drivers/ata/sata_inic162x.c +++ b/drivers/ata/sata_inic162x.c | |||
@@ -642,7 +642,9 @@ static int inic_pci_device_resume(struct pci_dev *pdev) | |||
642 | void __iomem *mmio_base = host->iomap[MMIO_BAR]; | 642 | void __iomem *mmio_base = host->iomap[MMIO_BAR]; |
643 | int rc; | 643 | int rc; |
644 | 644 | ||
645 | ata_pci_device_do_resume(pdev); | 645 | rc = ata_pci_device_do_resume(pdev); |
646 | if (rc) | ||
647 | return rc; | ||
646 | 648 | ||
647 | if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) { | 649 | if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) { |
648 | rc = init_controller(mmio_base, hpriv->cached_hctl); | 650 | rc = init_controller(mmio_base, hpriv->cached_hctl); |