summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/marvell
diff options
context:
space:
mode:
authorAmitkumar Karwar2016-10-21 17:15:48 +0200
committerKalle Valo2016-11-18 12:11:38 +0100
commit14e5e937592697d830537b7f6a59d45a6aa3d51b (patch)
tree25fe7506994475ef53cf47cff1ed9136dbd59166 /drivers/net/wireless/marvell
parentmwifiex: add power save parameters in hs_cfg cmd (diff)
downloadkernel-qcow2-linux-14e5e937592697d830537b7f6a59d45a6aa3d51b.tar.gz
kernel-qcow2-linux-14e5e937592697d830537b7f6a59d45a6aa3d51b.tar.xz
kernel-qcow2-linux-14e5e937592697d830537b7f6a59d45a6aa3d51b.zip
mwifiex: ignore calibration data failure
Firmware may reject calibration data from host for certain OTP settings. In that case, we should continue initialisation ignoring the failure. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell')
-rw-r--r--drivers/net/wireless/marvell/mwifiex/sta_cmd.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 11ddfccf9bd5..0a54e2136128 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -2245,19 +2245,13 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
adapter->hs_cfg.gpio = data;
}
- ret = mwifiex_dnld_dt_cfgdata(priv, adapter->dt_node,
- "marvell,caldata");
- if (ret)
- return -1;
+ mwifiex_dnld_dt_cfgdata(priv, adapter->dt_node,
+ "marvell,caldata");
}
- if (adapter->cal_data) {
- ret = mwifiex_send_cmd(priv, HostCmd_CMD_CFG_DATA,
- HostCmd_ACT_GEN_SET, 0, NULL,
- true);
- if (ret)
- return -1;
- }
+ if (adapter->cal_data)
+ mwifiex_send_cmd(priv, HostCmd_CMD_CFG_DATA,
+ HostCmd_ACT_GEN_SET, 0, NULL, true);
/* Read MAC address from HW */
ret = mwifiex_send_cmd(priv, HostCmd_CMD_GET_HW_SPEC,