diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2010-10-11 15:45:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 21:04:18 -0700 |
| commit | 1ebafa01d2a80da61e43a77e7c245c1ca19eb381 (patch) | |
| tree | 9f438aa5b04c941b4f7aba2669b83e77ac8e9f7f /drivers | |
| parent | e98637ef0ae4b186afa5d30ad268f4b2ef674462 (diff) | |
b44: fix carrier detection on bind
commit bcf64aa379fcadd074449cbf0c049da70071b06f upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -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 012614e9c9c..74b68de66fd 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -2164,8 +2164,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, @@ -2205,6 +2203,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 |