From 4ad0d590a12830b61fe5912e7e861ee98cc06f2e Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Mon, 4 Aug 2008 14:59:46 -0700 Subject: [PATCH] --- yaml --- r: 107961 b: refs/heads/master c: c743a87eabc50110ba5e473e707079c9b429779a h: refs/heads/master i: 107959: 7bb4a9137054478c22185187e6299593d1d80139 v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4d3bdec430c9..1c59a2095ea2 100644 --- 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 index f23a0487bf13..cfed2b07f3a4 100644 --- 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);