mwifiex: fix unconditional error return in .add_virtual_intf callback
authorJavier Martinez Canillas <javier@osg.samsung.com>
Fri, 1 Jul 2016 19:39:42 +0000 (15:39 -0400)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 5 Jul 2016 13:27:50 +0000 (16:27 +0300)
The commit 7311ea850079 ("mwifiex: fix AP start problem for newly added
interface") attempted to fix an issue when a new AP interface is added.

But the patch didn't check the return value of the functions doing the
firmware calls and returned an error even if the functions didn't fail.

This prevents the network device to be registered properly, so fix it.

Fixes: 7311ea850079 ("mwifiex: fix AP start problem for newly added interface")
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/marvell/mwifiex/cfg80211.c

index 99e8cf1..5de9f63 100644 (file)
@@ -2865,9 +2865,11 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
 
        ret = mwifiex_send_cmd(priv, HostCmd_CMD_SET_BSS_MODE,
                               HostCmd_ACT_GEN_SET, 0, NULL, true);
+       if (ret)
                return ERR_PTR(ret);
 
        ret = mwifiex_sta_init_cmd(priv, false, false);
+       if (ret)
                return ERR_PTR(ret);
 
        mwifiex_setup_ht_caps(&wiphy->bands[NL80211_BAND_2GHZ]->ht_cap, priv);