diff options
| author | Eilon Greenstein <eilong@broadcom.com> | 2008-11-03 16:46:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-03 16:46:40 -0800 |
| commit | 12b56ea89e70d4b04f2f5199750310e82894ebbd (patch) | |
| tree | 80ec95e06b2b3cf93b18ea8f8b5da3ee79a72087 | |
| parent | 7d96567ac0527703cf1b80043fc0ebd7f21a10ad (diff) | |
| download | linux-12b56ea89e70d4b04f2f5199750310e82894ebbd.tar.gz linux-12b56ea89e70d4b04f2f5199750310e82894ebbd.tar.bz2 linux-12b56ea89e70d4b04f2f5199750310e82894ebbd.zip | |
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 <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/bnx2x_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 61152e149e67..5b013d8457c5 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, |