summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ti
diff options
context:
space:
mode:
authorLuciano Coelho <coelho@ti.com>2012-12-12 10:14:22 +0200
committerLuciano Coelho <coelho@ti.com>2013-02-08 10:05:01 +0200
commit9646b1346760a0af1035f0c59ba727fca1f5824d (patch)
tree1a543cb3b0c1d22b130405afac1e3ea6692a0674 /drivers/net/wireless/ti
parentb26f5f09ebdeb85ab152344cc1d6d484a3ce967d (diff)
downloadtalos-obmc-linux-9646b1346760a0af1035f0c59ba727fca1f5824d.tar.gz
talos-obmc-linux-9646b1346760a0af1035f0c59ba727fca1f5824d.zip
wlcore: use single-role version when verifying the PLT firmware
The PLT firmware used by wl12xx for calibration always has the same version number as the single-role firmware. Currntly the driver rejects the PLT firmware since anything that is not single-role uses the multi-role version. Fix this by using the single-role version for everything except multi-role. Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/ti')
-rw-r--r--drivers/net/wireless/ti/wlcore/boot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ti/wlcore/boot.c b/drivers/net/wireless/ti/wlcore/boot.c
index b58ae5fc1487..77752b03f189 100644
--- a/drivers/net/wireless/ti/wlcore/boot.c
+++ b/drivers/net/wireless/ti/wlcore/boot.c
@@ -84,8 +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->fw_type == WL12XX_FW_TYPE_NORMAL) ?
- wl->min_sr_fw_ver : wl->min_mr_fw_ver;
+ unsigned int *min_ver = (wl->fw_type == WL12XX_FW_TYPE_MULTI) ?
+ wl->min_mr_fw_ver : wl->min_sr_fw_ver;
char min_fw_str[32] = "";
int i;
OpenPOWER on IntegriCloud