From 0414af97d3af678a0603cf211101ab533242cc63 Mon Sep 17 00:00:00 2001
From: Robert Hancock <hancockr@shaw.ca>
Date: Mon, 5 Feb 2007 16:26:04 -0800
Subject: [PATCH] --- yaml --- r: 47389 b: refs/heads/master c:
 ce053fa8b532aa038fba6230052daae5cd60eae6 h: refs/heads/master i:   47387:
 5a267c075d45164360704619180dc020471523dd v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/ata/sata_nv.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8017a7ed9973..495119424d40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2cfe81a59eea45a3f9afb4f652f7619982eac62
+refs/heads/master: ce053fa8b532aa038fba6230052daae5cd60eae6
diff --git a/trunk/drivers/ata/sata_nv.c b/trunk/drivers/ata/sata_nv.c
index aea005d5663c..095ef1b2cd0e 100644
--- a/trunk/drivers/ata/sata_nv.c
+++ b/trunk/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) {