diff options
| author | Luciano Coelho <coelho@ti.com> | 2012-11-27 13:52:00 (GMT) |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2012-12-04 14:36:12 (GMT) |
| commit | 8675f9abdf5b67a3f621fa99e1f0e0c8d8ae2531 (patch) | |
| tree | de74d34ec5a539ef4e281d20281fc648c8bdd745 /drivers/net/wireless/ti/wlcore/boot.c | |
| parent | b3ec9cf2052981171364c4f354f53a64089ecc75 (diff) | |
| download | linux-8675f9abdf5b67a3f621fa99e1f0e0c8d8ae2531.tar.xz | |
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/wlcore/boot.c')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/boot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/boot.c b/drivers/net/wireless/ti/wlcore/boot.c index 2c57246..b58ae5f 100644 --- 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; |