---

yaml --- r: 211501 b: refs/heads/master c: bcf64aa h: refs/heads/master i: 211499: 1b30f70 v: v3
git-mirror · Oct 11, 2010 · fc0f0a3 · fc0f0a3
1 parent bb0c313
commit fc0f0a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b00916b189d13a615ff05c9242201135992fcda3
+refs/heads/master: bcf64aa379fcadd074449cbf0c049da70071b06f
diff --git a/trunk/drivers/net/b44.c b/trunk/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