aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2008-09-03 12:31:54 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-09-08 14:00:17 -0400
commit0b7dcd9652c8d6b2a0dd04f3a3e6ca0574560042 (patch)
treea3fcd14b6c29f3f256e73dc23e7dd506d25a17f7
parentcb24f57fe6f94a445fad8fab6ebdde7c51857895 (diff)
b43: Replace hardcoded Analog switch
Replace a hardcoded Analog switch (which breaks on N-PHY) by a call to the switch_analog PHY operation. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/b43/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index ab9fa8126b7..c836beceb10 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2718,7 +2718,8 @@ static int b43_chip_init(struct b43_wldev *dev)
if (err)
goto err_gpio_clean;
- b43_write16(dev, 0x03E6, 0x0000);
+ /* Turn the Analog on and initialize the PHY. */
+ phy->ops->switch_analog(dev, 1);
err = b43_phy_init(dev);
if (err)
goto err_gpio_clean;