diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-03-23 05:35:51 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-03-30 04:33:42 -0400 |
commit | 2d7defb07bbee286537457e5eab534bac01d126a (patch) | |
tree | 011b5f6d126b97e7155b0547e71907cfd01e4cff /drivers/net/wireless/mwifiex | |
parent | 2f5872b60146eadf74b8d349a3596f5aaf687401 (diff) |
mwifiex: remove an unneede NULL check in mwifiex_init_adapter()
"adapter->sleep_cfm" is always non-NULL at this point. Static checkers
complain that we already dereference it at the start of the function
when we do:
skb_put(adapter->sleep_cfm, sizeof(struct mwifiex_opt_sleep_confirm));
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r-- | drivers/net/wireless/mwifiex/init.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c index 6936de8c8a94..e12192f5cfad 100644 --- a/drivers/net/wireless/mwifiex/init.c +++ b/drivers/net/wireless/mwifiex/init.c | |||
@@ -266,18 +266,15 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) | |||
266 | 266 | ||
267 | mwifiex_wmm_init(adapter); | 267 | mwifiex_wmm_init(adapter); |
268 | 268 | ||
269 | if (adapter->sleep_cfm) { | 269 | sleep_cfm_buf = (struct mwifiex_opt_sleep_confirm *) |
270 | sleep_cfm_buf = (struct mwifiex_opt_sleep_confirm *) | 270 | adapter->sleep_cfm->data; |
271 | adapter->sleep_cfm->data; | 271 | memset(sleep_cfm_buf, 0, adapter->sleep_cfm->len); |
272 | memset(sleep_cfm_buf, 0, adapter->sleep_cfm->len); | 272 | sleep_cfm_buf->command = cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH); |
273 | sleep_cfm_buf->command = | 273 | sleep_cfm_buf->size = cpu_to_le16(adapter->sleep_cfm->len); |
274 | cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH); | 274 | sleep_cfm_buf->result = 0; |
275 | sleep_cfm_buf->size = | 275 | sleep_cfm_buf->action = cpu_to_le16(SLEEP_CONFIRM); |
276 | cpu_to_le16(adapter->sleep_cfm->len); | 276 | sleep_cfm_buf->resp_ctrl = cpu_to_le16(RESP_NEEDED); |
277 | sleep_cfm_buf->result = 0; | 277 | |
278 | sleep_cfm_buf->action = cpu_to_le16(SLEEP_CONFIRM); | ||
279 | sleep_cfm_buf->resp_ctrl = cpu_to_le16(RESP_NEEDED); | ||
280 | } | ||
281 | memset(&adapter->sleep_params, 0, sizeof(adapter->sleep_params)); | 278 | memset(&adapter->sleep_params, 0, sizeof(adapter->sleep_params)); |
282 | memset(&adapter->sleep_period, 0, sizeof(adapter->sleep_period)); | 279 | memset(&adapter->sleep_period, 0, sizeof(adapter->sleep_period)); |
283 | adapter->tx_lock_flag = false; | 280 | adapter->tx_lock_flag = false; |