From fc0f0a32fac1dbe99c6b3d51d765ddf6cdf352b7 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Mon, 11 Oct 2010 15:45:35 -0700 Subject: [PATCH] --- yaml --- r: 211501 b: refs/heads/master c: bcf64aa379fcadd074449cbf0c049da70071b06f h: refs/heads/master i: 211499: 1b30f70d755b2452e4d0f00d8ae9ff9c5d97af0b v: v3 --- [refs] | 2 +- trunk/drivers/net/b44.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index af942968e1ff..fd127203fd57 100644 --- 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 index 1e620e287ae0..efeffdf9e5fa 100644 --- 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