diff options
author | Tejun Heo <htejun@gmail.com> | 2006-12-26 05:39:50 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-09 17:39:30 -0500 |
commit | 553c4aa630af7bc885e056d0436e4eb7f238579b (patch) | |
tree | 5a6cf3b15e05309fcfbdb5f68471e2a20b235613 /drivers/ata/sata_sil.c | |
parent | 8bfa79fcb81d2bdb043f60ab4171704467808b55 (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/sata_sil.c')
-rw-r--r-- | drivers/ata/sata_sil.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index d27ab312cdfb..1f3fdcf29876 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c | |||
@@ -710,8 +710,12 @@ err_out: | |||
710 | static int sil_pci_device_resume(struct pci_dev *pdev) | 710 | static int sil_pci_device_resume(struct pci_dev *pdev) |
711 | { | 711 | { |
712 | struct ata_host *host = dev_get_drvdata(&pdev->dev); | 712 | struct ata_host *host = dev_get_drvdata(&pdev->dev); |
713 | int rc; | ||
714 | |||
715 | rc = ata_pci_device_do_resume(pdev); | ||
716 | if (rc) | ||
717 | return rc; | ||
713 | 718 | ||
714 | ata_pci_device_do_resume(pdev); | ||
715 | sil_init_controller(pdev, host->n_ports, host->ports[0]->flags, | 719 | sil_init_controller(pdev, host->n_ports, host->ports[0]->flags, |
716 | host->mmio_base); | 720 | host->mmio_base); |
717 | ata_host_resume(host); | 721 | ata_host_resume(host); |