wl18xx: copy the default configuration before checking the board_type

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / net / wireless / ti / wl18xx / main.c

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index d4e331f..f5ec6f6 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);
 }