diff options
| author | Tejun Heo <htejun@gmail.com> | 2006-12-26 19:39:50 +0900 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-09 17:39:30 -0500 |
| commit | 553c4aa630af7bc885e056d0436e4eb7f238579b (patch) | |
| tree | 5a6cf3b15e05309fcfbdb5f68471e2a20b235613 /drivers/ata/sata_sil24.c | |
| parent | 8bfa79fcb81d2bdb043f60ab4171704467808b55 (diff) | |
| download | linux-553c4aa630af7bc885e056d0436e4eb7f238579b.tar.gz linux-553c4aa630af7bc885e056d0436e4eb7f238579b.tar.bz2 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/sata_sil24.c')
| -rw-r--r-- | drivers/ata/sata_sil24.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 5aa288d2fb86..da982ed4bc47 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c @@ -1200,8 +1200,11 @@ static int sil24_pci_device_resume(struct pci_dev *pdev) { struct ata_host *host = dev_get_drvdata(&pdev->dev); struct sil24_host_priv *hpriv = host->private_data; + 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) writel(HOST_CTRL_GLOBAL_RST, hpriv->host_base + HOST_CTRL); |