summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2009-02-27 07:35:02 +0100
committerDavid S. Miller <davem@davemloft.net>2009-02-27 07:35:02 +0100
commite92aa634a33739478958f4109d6bd35b36d13532 (patch)
tree579c74f1f0179df950aec6215cb03e13c612b41c
parentb44: Unconditionally enable interrupt routing on reset (diff)
downloadlinux-e92aa634a33739478958f4109d6bd35b36d13532.tar.xz
linux-e92aa634a33739478958f4109d6bd35b36d13532.zip
b44: Disable device on shutdown
Disable the SSB core on device shutdown. This has two advantages: 1) A clean device shutdown is always desired here, because we disable the device's global crystal in the next statement. 2) This fixes a bug where the device will come up with the enable-bit set on the next initialization (without a reboot inbetween). This causes breakage on the second initialization due to code that checks this bit (ssb_device_is_enabled() checks). Reported-by: Pantelis Koukousoulas <pktoss@gmail.com> Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/b44.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 6b8c39f2cf10..dc5f051005fa 100644
--- a/drivers/net/b44.c
+++ b/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);