|
@@ -328,12 +328,6 @@ static int wl1271_sta_hw_init(struct wl1271 *wl, struct wl12xx_vif *wlvif)
|
|
|
{
|
|
|
int ret;
|
|
|
|
|
|
- if (wl->chip.id != CHIP_ID_1283_PG20) {
|
|
|
- ret = wl1271_cmd_ext_radio_parms(wl);
|
|
|
- if (ret < 0)
|
|
|
- return ret;
|
|
|
- }
|
|
|
-
|
|
|
/* PS config */
|
|
|
ret = wl12xx_acx_config_ps(wl, wlvif);
|
|
|
if (ret < 0)
|
|
@@ -659,19 +653,24 @@ int wl1271_hw_init(struct wl1271 *wl)
|
|
|
{
|
|
|
int ret;
|
|
|
|
|
|
- if (wl->chip.id == CHIP_ID_1283_PG20)
|
|
|
+ if (wl->chip.id == CHIP_ID_1283_PG20) {
|
|
|
ret = wl128x_cmd_general_parms(wl);
|
|
|
- else
|
|
|
- ret = wl1271_cmd_general_parms(wl);
|
|
|
- if (ret < 0)
|
|
|
- return ret;
|
|
|
-
|
|
|
- if (wl->chip.id == CHIP_ID_1283_PG20)
|
|
|
+ if (ret < 0)
|
|
|
+ return ret;
|
|
|
ret = wl128x_cmd_radio_parms(wl);
|
|
|
- else
|
|
|
+ if (ret < 0)
|
|
|
+ return ret;
|
|
|
+ } else {
|
|
|
+ ret = wl1271_cmd_general_parms(wl);
|
|
|
+ if (ret < 0)
|
|
|
+ return ret;
|
|
|
ret = wl1271_cmd_radio_parms(wl);
|
|
|
- if (ret < 0)
|
|
|
- return ret;
|
|
|
+ if (ret < 0)
|
|
|
+ return ret;
|
|
|
+ ret = wl1271_cmd_ext_radio_parms(wl);
|
|
|
+ if (ret < 0)
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
|
|
|
/* Chip-specific init */
|
|
|
ret = wl1271_chip_specific_init(wl);
|