From: Eilon Greenstein Date: Tue, 4 Nov 2008 00:46:40 +0000 (-0800) Subject: bnx2x: Calling netif_carrier_off at the end of the probe X-Git-Tag: v2.6.28-rc4~22^2~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12b56ea89e70d4b04f2f5199750310e82894ebbd;p=profile%2Fivi%2Fkernel-x86-ivi.git bnx2x: Calling netif_carrier_off at the end of the probe netif_carrier_off was called too early at the probe. In case of failure or simply bad timing, this can cause a fatal error since linkwatch_event might run too soon. Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller --- diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 61152e1..5b013d8 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -10206,8 +10206,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev, return -ENOMEM; } - netif_carrier_off(dev); - bp = netdev_priv(dev); bp->msglevel = debug; @@ -10231,6 +10229,8 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev, goto init_one_exit; } + netif_carrier_off(dev); + bp->common.name = board_info[ent->driver_data].name; printk(KERN_INFO "%s: %s (%c%d) PCI-E x%d %s found at mem %lx," " IRQ %d, ", dev->name, bp->common.name,