From 4e55410c8cef2b8c6f5b6100e8f1a223cec2e7fb Mon Sep 17 00:00:00 2001
From: Steve Hodgson <shodgson@solarflare.com>
Date: Fri, 12 Feb 2010 12:32:27 -0800
Subject: [PATCH] --- yaml --- r: 180600 b: refs/heads/master c:
 5e2a911cecc7e0fd89b1d2d001b7b89d47057ad6 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/sfc/efx.c        | 1 +
 trunk/drivers/net/sfc/qt202x_phy.c | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3f7794364ec5..e3e4eeb62db5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6b471e6454c0e1c6d756672841cbaeae7c949f8
+refs/heads/master: 5e2a911cecc7e0fd89b1d2d001b7b89d47057ad6
diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c
index 103e8b0e2a0d..46997e177ee3 100644
--- a/trunk/drivers/net/sfc/efx.c
+++ b/trunk/drivers/net/sfc/efx.c
@@ -2284,6 +2284,7 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
  fail2:
 	efx_fini_struct(efx);
  fail1:
+	WARN_ON(rc > 0);
 	EFX_LOG(efx, "initialisation failed. rc=%d\n", rc);
 	free_netdev(net_dev);
 	return rc;
diff --git a/trunk/drivers/net/sfc/qt202x_phy.c b/trunk/drivers/net/sfc/qt202x_phy.c
index e0d13a451019..67eec7a6e487 100644
--- a/trunk/drivers/net/sfc/qt202x_phy.c
+++ b/trunk/drivers/net/sfc/qt202x_phy.c
@@ -320,7 +320,7 @@ static int qt202x_reset_phy(struct efx_nic *efx)
 
 	falcon_board(efx)->type->init_phy(efx);
 
-	return rc;
+	return 0;
 
  fail:
 	EFX_ERR(efx, "PHY reset timed out\n");