aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Hancock <hancockr@shaw.ca>2007-02-05 16:26:04 -0800
committerJeff Garzik <jeff@garzik.org>2007-02-09 17:39:40 -0500
commitce053fa8b532aa038fba6230052daae5cd60eae6 (patch)
tree79fd15871c469fb199e1e0c74ed1f8996b902b1c
parenta2cfe81a59eea45a3f9afb4f652f7619982eac62 (diff)
downloadlinux-2.6.34-ux500-ce053fa8b532aa038fba6230052daae5cd60eae6.tar.gz
sata_nv: propagate ata_pci_device_do_resume return value
ata_pci_device_do_resume can fail if the PCI device couldn't be re-enabled. Update sata_nv to propagate the return value from this call and to not try to do any other resume activities if it fails. Fixes a compile warning. Signed-off-by: Robert Hancock <hancockr@shaw.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/ata/sata_nv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index aea005d5663..095ef1b2cd0 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -1575,8 +1575,11 @@ static int nv_pci_device_resume(struct pci_dev *pdev)
{
struct ata_host *host = dev_get_drvdata(&pdev->dev);
struct nv_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) {
if(hpriv->type >= CK804) {