diff --git a/[refs] b/[refs] index b4ab7ec4475b..668bb0be7a08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8af11af85fecbfa7b95fd79c043b16ae0ee0d55 +refs/heads/master: e92aa634a33739478958f4109d6bd35b36d13532 diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c index 6b8c39f2cf10..dc5f051005fa 100644 --- a/trunk/drivers/net/b44.c +++ b/trunk/drivers/net/b44.c @@ -2240,6 +2240,7 @@ static void __devexit b44_remove_one(struct ssb_device *sdev) struct net_device *dev = ssb_get_drvdata(sdev); unregister_netdev(dev); + ssb_device_disable(sdev, 0); ssb_bus_may_powerdown(sdev->bus); free_netdev(dev); ssb_pcihost_set_power_state(sdev, PCI_D3hot);