From: Robert Hancock <hancockr@shaw.ca>
Date: Tue, 6 Feb 2007 00:26:04 +0000 (-0800)
Subject: sata_nv: propagate ata_pci_device_do_resume return value
X-Git-Tag: v2.6.21-rc1~274^2~483
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ce053fa8b532aa038fba6230052daae5cd60eae6;p=linux-2.6-omap-h63xx.git

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>
---

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) {