diff options
author | Luciano Coelho <coelho@ti.com> | 2012-05-10 05:13:58 -0400 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2012-06-05 08:57:20 -0400 |
commit | 776f030aa0ed65fbc266219fb858bbfc909d97d2 (patch) | |
tree | 3fadaae298eb0171f4369c554615bda8a724c997 /drivers/net/wireless/ti/wl18xx | |
parent | df472894ab21814edf54a3cd81c8ae7066365e0e (diff) |
wl18xx: copy the default configuration before checking the board_type
We were changing the low_band_component_type in the private
configuration structure before copying the default values to it, so
the change was overwritten and only took effect after HW recovery.
Reported-by: Dror Erez <drorer@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Diffstat (limited to 'drivers/net/wireless/ti/wl18xx')
-rw-r--r-- | drivers/net/wireless/ti/wl18xx/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c index d4e331fb73e3..f5ec6f60db33 100644 --- a/drivers/net/wireless/ti/wl18xx/main.c +++ b/drivers/net/wireless/ti/wl18xx/main.c | |||
@@ -1072,6 +1072,8 @@ int __devinit wl18xx_probe(struct platform_device *pdev) | |||
1072 | memcpy(&wl->ht_cap, &wl18xx_mimo_ht_cap, | 1072 | memcpy(&wl->ht_cap, &wl18xx_mimo_ht_cap, |
1073 | sizeof(wl18xx_mimo_ht_cap)); | 1073 | sizeof(wl18xx_mimo_ht_cap)); |
1074 | 1074 | ||
1075 | wl18xx_conf_init(wl); | ||
1076 | |||
1075 | if (!board_type_param) { | 1077 | if (!board_type_param) { |
1076 | board_type_param = kstrdup("dvp", GFP_KERNEL); | 1078 | board_type_param = kstrdup("dvp", GFP_KERNEL); |
1077 | priv->board_type = BOARD_TYPE_DVP_18XX; | 1079 | priv->board_type = BOARD_TYPE_DVP_18XX; |
@@ -1100,8 +1102,6 @@ int __devinit wl18xx_probe(struct platform_device *pdev) | |||
1100 | 1102 | ||
1101 | wl->enable_11a = enable_11a_param; | 1103 | wl->enable_11a = enable_11a_param; |
1102 | 1104 | ||
1103 | wl18xx_conf_init(wl); | ||
1104 | |||
1105 | return wlcore_probe(wl, pdev); | 1105 | return wlcore_probe(wl, pdev); |
1106 | } | 1106 | } |
1107 | 1107 | ||