---

yaml --- r: 107961 b: refs/heads/master c: c743a87 h: refs/heads/master i: 107959: 7bb4a91 v: v3
git-mirror · Aug 7, 2008 · 4ad0d59 · 4ad0d59
1 parent 4fd33c9
commit 4ad0d59
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 106ef2fef3778f4af2e0f796a108cc19c6114264
+refs/heads/master: c743a87eabc50110ba5e473e707079c9b429779a
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
@@ -1372,7 +1372,8 @@ static void __devexit igb_remove(struct pci_dev *pdev)
 
 	unregister_netdev(netdev);
 
-	if (!igb_check_reset_block(&adapter->hw))
+	if (adapter->hw.phy.ops.reset_phy &&
+	    !igb_check_reset_block(&adapter->hw))
 		adapter->hw.phy.ops.reset_phy(&adapter->hw);
 
 	igb_remove_device(&adapter->hw);