diff options
Diffstat (limited to 'drivers/net/wireless/b43legacy/phy.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/phy.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c index f9edbd5f3009..22a4b3d0186d 100644 --- a/drivers/net/wireless/b43legacy/phy.c +++ b/drivers/net/wireless/b43legacy/phy.c | |||
| @@ -462,12 +462,7 @@ static void b43legacy_phy_initb2(struct b43legacy_wldev *dev) | |||
| 462 | val -= 0x0202; | 462 | val -= 0x0202; |
| 463 | } | 463 | } |
| 464 | b43legacy_phy_write(dev, 0x03E4, 0x3000); | 464 | b43legacy_phy_write(dev, 0x03E4, 0x3000); |
| 465 | if (phy->channel == 0xFF) | 465 | b43legacy_radio_selectchannel(dev, phy->channel, 0); |
| 466 | b43legacy_radio_selectchannel(dev, | ||
| 467 | B43legacy_RADIO_DEFAULT_CHANNEL_BG, | ||
| 468 | 0); | ||
| 469 | else | ||
| 470 | b43legacy_radio_selectchannel(dev, phy->channel, 0); | ||
| 471 | if (phy->radio_ver != 0x2050) { | 466 | if (phy->radio_ver != 0x2050) { |
| 472 | b43legacy_radio_write16(dev, 0x0075, 0x0080); | 467 | b43legacy_radio_write16(dev, 0x0075, 0x0080); |
| 473 | b43legacy_radio_write16(dev, 0x0079, 0x0081); | 468 | b43legacy_radio_write16(dev, 0x0079, 0x0081); |
| @@ -516,12 +511,7 @@ static void b43legacy_phy_initb4(struct b43legacy_wldev *dev) | |||
| 516 | val -= 0x0202; | 511 | val -= 0x0202; |
| 517 | } | 512 | } |
| 518 | b43legacy_phy_write(dev, 0x03E4, 0x3000); | 513 | b43legacy_phy_write(dev, 0x03E4, 0x3000); |
| 519 | if (phy->channel == 0xFF) | 514 | b43legacy_radio_selectchannel(dev, phy->channel, 0); |
| 520 | b43legacy_radio_selectchannel(dev, | ||
| 521 | B43legacy_RADIO_DEFAULT_CHANNEL_BG, | ||
| 522 | 0); | ||
| 523 | else | ||
| 524 | b43legacy_radio_selectchannel(dev, phy->channel, 0); | ||
| 525 | if (phy->radio_ver != 0x2050) { | 515 | if (phy->radio_ver != 0x2050) { |
| 526 | b43legacy_radio_write16(dev, 0x0075, 0x0080); | 516 | b43legacy_radio_write16(dev, 0x0075, 0x0080); |
| 527 | b43legacy_radio_write16(dev, 0x0079, 0x0081); | 517 | b43legacy_radio_write16(dev, 0x0079, 0x0081); |