Updated to 2.6.32.27
/drivers/net/b44.c
blob:4869adb695865a3f7dc4ff3bacd1ee5a260b296d -> blob:137cb031df6cdc9b36e97abc06851cd62124e943
--- drivers/net/b44.c
+++ drivers/net/b44.c
@@ -2175,8 +2175,6 @@ static int __devinit b44_init_one(struct
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,
@@ -2216,6 +2214,8 @@ static int __devinit b44_init_one(struct
goto err_out_powerdown;
}
+ netif_carrier_off(dev);
+
ssb_set_drvdata(sdev, dev);
/* Chip reset provides power to the b44 MAC & PCI cores, which