diff options
| author | Tejun Heo <htejun@gmail.com> | 2006-12-26 11:39:50 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-09 23:39:30 +0100 |
| commit | 553c4aa630af7bc885e056d0436e4eb7f238579b (patch) | |
| tree | 5a6cf3b15e05309fcfbdb5f68471e2a20b235613 /drivers/ata/ahci.c | |
| parent | libata: use ata_id_c_string() (diff) | |
| download | linux-553c4aa630af7bc885e056d0436e4eb7f238579b.tar.xz linux-553c4aa630af7bc885e056d0436e4eb7f238579b.zip | |
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.c | 4 |
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) void __iomem *mmio = host->mmio_base; 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 = ahci_reset_controller(mmio, pdev); |