wlcore/wl12xx/wl18xx: verify multi-role and single-role fw versions

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / ti / wlcore / boot.c

diff --git a/drivers/net/wireless/ti/wlcore/boot.c b/drivers/net/wireless/ti/wlcore/boot.c
index 2c57246b6a851c7e3f37dea8de0f01435035f405..b58ae5fc14879f2c073305b8f36ccc180400ba94 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/boot.c
+++ b/drivers/net/wireless/ti/wlcore/boot.c
@@ -84,7 +84,8 @@ out:
 static int wlcore_validate_fw_ver(struct wl1271 *wl)
 {
        unsigned int *fw_ver = wl->chip.fw_ver;
-       unsigned int *min_ver = wl->min_fw_ver;
+       unsigned int *min_ver = (wl->fw_type == WL12XX_FW_TYPE_NORMAL) ?
+               wl->min_sr_fw_ver : wl->min_mr_fw_ver;
        char min_fw_str[32] = "";
        int i;