aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/wl12xx/init.c')
-rw-r--r--drivers/net/wireless/wl12xx/init.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c
index 88891cdfdd4..76625145e32 100644
--- a/drivers/net/wireless/wl12xx/init.c
+++ b/drivers/net/wireless/wl12xx/init.c
@@ -328,12 +328,6 @@ static int wl1271_sta_hw_init(struct wl1271 *wl, struct wl12xx_vif *wlvif)
328{ 328{
329 int ret; 329 int ret;
330 330
331 if (wl->chip.id != CHIP_ID_1283_PG20) {
332 ret = wl1271_cmd_ext_radio_parms(wl);
333 if (ret < 0)
334 return ret;
335 }
336
337 /* PS config */ 331 /* PS config */
338 ret = wl12xx_acx_config_ps(wl, wlvif); 332 ret = wl12xx_acx_config_ps(wl, wlvif);
339 if (ret < 0) 333 if (ret < 0)
@@ -659,19 +653,24 @@ int wl1271_hw_init(struct wl1271 *wl)
659{ 653{
660 int ret; 654 int ret;
661 655
662 if (wl->chip.id == CHIP_ID_1283_PG20) 656 if (wl->chip.id == CHIP_ID_1283_PG20) {
663 ret = wl128x_cmd_general_parms(wl); 657 ret = wl128x_cmd_general_parms(wl);
664 else 658 if (ret < 0)
665 ret = wl1271_cmd_general_parms(wl); 659 return ret;
666 if (ret < 0)
667 return ret;
668
669 if (wl->chip.id == CHIP_ID_1283_PG20)
670 ret = wl128x_cmd_radio_parms(wl); 660 ret = wl128x_cmd_radio_parms(wl);
671 else 661 if (ret < 0)
662 return ret;
663 } else {
664 ret = wl1271_cmd_general_parms(wl);
665 if (ret < 0)
666 return ret;
672 ret = wl1271_cmd_radio_parms(wl); 667 ret = wl1271_cmd_radio_parms(wl);
673 if (ret < 0) 668 if (ret < 0)
674 return ret; 669 return ret;
670 ret = wl1271_cmd_ext_radio_parms(wl);
671 if (ret < 0)
672 return ret;
673 }
675 674
676 /* Chip-specific init */ 675 /* Chip-specific init */
677 ret = wl1271_chip_specific_init(wl); 676 ret = wl1271_chip_specific_init(wl);