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>

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index d4e331fb73e3fa78a2df2b1323f944d6b67b0819..f5ec6f60db334dfb0f26cf9e9f5ff441178cf3af 100644 (file)
--- 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)
                memcpy(&wl->ht_cap, &wl18xx_mimo_ht_cap,
                       sizeof(wl18xx_mimo_ht_cap));
 
+       wl18xx_conf_init(wl);
+
        if (!board_type_param) {
                board_type_param = kstrdup("dvp", GFP_KERNEL);
                priv->board_type = BOARD_TYPE_DVP_18XX;
@@ -1100,8 +1102,6 @@ int __devinit wl18xx_probe(struct platform_device *pdev)
 
        wl->enable_11a = enable_11a_param;
 
-       wl18xx_conf_init(wl);
-
        return wlcore_probe(wl, pdev);
 }