From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Mon, 4 Aug 2008 21:59:46 +0000 (-0700)
Subject: igb: fix null pointer dereference seen with fiber NICs
X-Git-Tag: v2.6.27-rc3~69^2~13^2~42
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c743a87eabc50110ba5e473e707079c9b429779a;p=linux-2.6-omap-h63xx.git

igb: fix null pointer dereference seen with fiber NICs

With a fiber or serdes NIC installed the driver was causing a null pointer
dereference on driver unload.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index f23a0487bf1..cfed2b07f3a 100644
--- a/drivers/net/igb/igb_main.c
+++ b/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);