diff options
Diffstat (limited to 'drivers/net/wireless/b43/phy_n.c')
-rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index e49d847c59f8..0963d593b247 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c | |||
@@ -753,8 +753,6 @@ static void b43_radio_init2055_post(struct b43_wldev *dev) | |||
753 | { | 753 | { |
754 | struct b43_phy_n *nphy = dev->phy.n; | 754 | struct b43_phy_n *nphy = dev->phy.n; |
755 | struct ssb_sprom *sprom = dev->dev->bus_sprom; | 755 | struct ssb_sprom *sprom = dev->dev->bus_sprom; |
756 | int i; | ||
757 | u16 val; | ||
758 | bool workaround = false; | 756 | bool workaround = false; |
759 | 757 | ||
760 | if (sprom->revision < 4) | 758 | if (sprom->revision < 4) |
@@ -777,15 +775,7 @@ static void b43_radio_init2055_post(struct b43_wldev *dev) | |||
777 | b43_radio_set(dev, B2055_CAL_MISC, 0x1); | 775 | b43_radio_set(dev, B2055_CAL_MISC, 0x1); |
778 | msleep(1); | 776 | msleep(1); |
779 | b43_radio_set(dev, B2055_CAL_MISC, 0x40); | 777 | b43_radio_set(dev, B2055_CAL_MISC, 0x40); |
780 | for (i = 0; i < 200; i++) { | 778 | if (!b43_radio_wait_value(dev, B2055_CAL_COUT2, 0x80, 0x80, 10, 2000)) |
781 | val = b43_radio_read(dev, B2055_CAL_COUT2); | ||
782 | if (val & 0x80) { | ||
783 | i = 0; | ||
784 | break; | ||
785 | } | ||
786 | udelay(10); | ||
787 | } | ||
788 | if (i) | ||
789 | b43err(dev->wl, "radio post init timeout\n"); | 779 | b43err(dev->wl, "radio post init timeout\n"); |
790 | b43_radio_mask(dev, B2055_CAL_LPOCTL, 0xFF7F); | 780 | b43_radio_mask(dev, B2055_CAL_LPOCTL, 0xFF7F); |
791 | b43_switch_channel(dev, dev->phy.channel); | 781 | b43_switch_channel(dev, dev->phy.channel); |