Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12b56ea8 authored by Eilon Greenstein's avatar Eilon Greenstein Committed by David S. Miller
Browse files

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: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7d96567a

drivers/net/bnx2x_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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,