---

yaml --- r: 162873 b: refs/heads/master c: d314737 h: refs/heads/master i: 162871: 38bf248 v: v3
git-mirror · Sep 15, 2009 · 040d0e2 · 040d0e2
1 parent a5ab647
commit 040d0e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;