diff options
author | Paul Fertser <fercerpav@gmail.com> | 2010-10-12 00:45:35 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-12 00:45:35 +0200 |
commit | bcf64aa379fcadd074449cbf0c049da70071b06f (patch) | |
tree | efb74355ddeb1fe71c97e77984e66973c25f0797 | |
parent | net: clear heap allocations for privileged ethtool actions (diff) | |
download | linux-bcf64aa379fcadd074449cbf0c049da70071b06f.tar.xz linux-bcf64aa379fcadd074449cbf0c049da70071b06f.zip |
b44: fix carrier detection on bind
For carrier detection to work properly when binding the driver with a cable
unplugged, netif_carrier_off() should be called after register_netdev(),
not before.
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/b44.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 1e620e287ae0..efeffdf9e5fa 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -2170,8 +2170,6 @@ static int __devinit b44_init_one(struct ssb_device *sdev, dev->irq = sdev->irq; SET_ETHTOOL_OPS(dev, &b44_ethtool_ops); - netif_carrier_off(dev); - err = ssb_bus_powerup(sdev->bus, 0); if (err) { dev_err(sdev->dev, @@ -2213,6 +2211,8 @@ static int __devinit b44_init_one(struct ssb_device *sdev, goto err_out_powerdown; } + netif_carrier_off(dev); + ssb_set_drvdata(sdev, dev); /* Chip reset provides power to the b44 MAC & PCI cores, which |