aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/ahci.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-12-26 05:39:50 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-09 17:39:30 -0500
commit553c4aa630af7bc885e056d0436e4eb7f238579b (patch)
tree5a6cf3b15e05309fcfbdb5f68471e2a20b235613 /drivers/ata/ahci.c
parent8bfa79fcb81d2bdb043f60ab4171704467808b55 (diff)
libata: handle pci_enable_device() failure while resuming
Handle pci_enable_device() failure while resuming. This patch kills the "ignoring return value of 'pci_enable_device'" warning message and propagates __must_check through ata_pci_device_do_resume(). Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/ahci.c')
-rw-r--r--drivers/ata/ahci.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index ca53d5a9c0c5..03b7a0051887 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1397,7 +1397,9 @@ static int ahci_pci_device_resume(struct pci_dev *pdev)
1397 void __iomem *mmio = host->mmio_base; 1397 void __iomem *mmio = host->mmio_base;
1398 int rc; 1398 int rc;
1399 1399
1400 ata_pci_device_do_resume(pdev); 1400 rc = ata_pci_device_do_resume(pdev);
1401 if (rc)
1402 return rc;
1401 1403
1402 if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) { 1404 if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
1403 rc = ahci_reset_controller(mmio, pdev); 1405 rc = ahci_reset_controller(mmio, pdev);