From 7f1f155bee061cd6134839a5646b16b31dda0616 Mon Sep 17 00:00:00 2001
From: Brice Goglin <brice@myri.com>
Date: Mon, 18 Dec 2006 11:52:34 +0100
Subject: [PATCH] --- yaml --- r: 45043 b: refs/heads/master c:
 1a63e846a4099e6fbff86a3b112064378515f254 h: refs/heads/master i:   45041:
 58a9bf701e0884eedb2c0a9729259886a5d81d67   45039:
 8db77dadfab8fc9b8b7ff793f01f3a8eb026bf46 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/net/myri10ge/myri10ge.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ac026e68820d..df2f71eb3da3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83f6e1524586119df84f70b7127688c57349664a
+refs/heads/master: 1a63e846a4099e6fbff86a3b112064378515f254
diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c
index 9bc5dab949fd..07cf574197e5 100644
--- a/trunk/drivers/net/myri10ge/myri10ge.c
+++ b/trunk/drivers/net/myri10ge/myri10ge.c
@@ -2540,8 +2540,8 @@ static int myri10ge_suspend(struct pci_dev *pdev, pm_message_t state)
 	myri10ge_dummy_rdma(mgp, 0);
 	pci_save_state(pdev);
 	pci_disable_device(pdev);
-	pci_set_power_state(pdev, pci_choose_state(pdev, state));
-	return 0;
+
+	return pci_set_power_state(pdev, pci_choose_state(pdev, state));
 }
 
 static int myri10ge_resume(struct pci_dev *pdev)
@@ -2564,12 +2564,14 @@ static int myri10ge_resume(struct pci_dev *pdev)
 		return -EIO;
 	}
 
-	pci_restore_state(pdev);
+	status = pci_restore_state(pdev);
+	if (status)
+		return status;
 
 	status = pci_enable_device(pdev);
-	if (status < 0) {
+	if (status) {
 		dev_err(&pdev->dev, "failed to enable device\n");
-		return -EIO;
+		return status;
 	}
 
 	pci_set_master(pdev);