aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ti/wl18xx
diff options
context:
space:
mode:
authorLuciano Coelho <coelho@ti.com>2012-11-27 15:52:00 +0200
committerLuciano Coelho <coelho@ti.com>2012-12-04 16:36:12 +0200
commit8675f9abdf5b67a3f621fa99e1f0e0c8d8ae2531 (patch)
treede74d34ec5a539ef4e281d20281fc648c8bdd745 /drivers/net/wireless/ti/wl18xx
parentb3ec9cf2052981171364c4f354f53a64089ecc75 (diff)
downloadvexpress-lsk-8675f9abdf5b67a3f621fa99e1f0e0c8d8ae2531.tar.gz
wlcore/wl12xx/wl18xx: verify multi-role and single-role fw versions
Previously we were only checking the single-role firmware version. Now add code to check for the firmware versions separately for each firmware type. Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/ti/wl18xx')
-rw-r--r--drivers/net/wireless/ti/wl18xx/main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 98d034b4530..08c3a2fc427 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -623,9 +623,11 @@ static int wl18xx_identify_chip(struct wl1271 *wl)
WLCORE_QUIRK_REGDOMAIN_CONF |
WLCORE_QUIRK_DUAL_PROBE_TMPL;
- wlcore_set_min_fw_ver(wl, WL18XX_CHIP_VER, WL18XX_IFTYPE_VER,
- WL18XX_MAJOR_VER, WL18XX_SUBTYPE_VER,
- WL18XX_MINOR_VER);
+ wlcore_set_min_fw_ver(wl, WL18XX_CHIP_VER,
+ WL18XX_IFTYPE_VER, WL18XX_MAJOR_VER,
+ WL18XX_SUBTYPE_VER, WL18XX_MINOR_VER,
+ /* there's no separate multi-role FW */
+ 0, 0, 0, 0);
break;
case CHIP_ID_185x_PG10:
wl1271_warning("chip id 0x%x (185x PG10) is deprecated",