From 040d0e224df4662b2864d9f13e62ba42335e85c1 Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Mon, 14 Sep 2009 08:23:13 +0000
Subject: [PATCH] --- yaml --- r: 162873 b: refs/heads/master c:
 d314737ad3bad6b4603b243fd6db572385259690 h: refs/heads/master i:   162871:
 38bf248e631b99aaea33f1d9dddc3998a71b8f02 v: v3

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

diff --git a/[refs] b/[refs]
index db141f63a815..f3702d70d2c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fb02a26bda1cbc3553164a8358c303d936255c5
+refs/heads/master: d314737ad3bad6b4603b243fd6db572385259690
diff --git a/trunk/drivers/net/igb/e1000_phy.c b/trunk/drivers/net/igb/e1000_phy.c
index c1f4da630420..ee460600e74b 100644
--- a/trunk/drivers/net/igb/e1000_phy.c
+++ b/trunk/drivers/net/igb/e1000_phy.c
@@ -1565,9 +1565,12 @@ s32 igb_get_phy_info_igp(struct e1000_hw *hw)
  **/
 s32 igb_phy_sw_reset(struct e1000_hw *hw)
 {
-	s32 ret_val;
+	s32 ret_val = 0;
 	u16 phy_ctrl;
 
+	if (!(hw->phy.ops.read_reg))
+		goto out;
+
 	ret_val = hw->phy.ops.read_reg(hw, PHY_CONTROL, &phy_ctrl);
 	if (ret_val)
 		goto out;