OSDN Git Service

mwifiex: fixup init_channel_scan_gap error case
authorBrian Norris <briannorris@chromium.org>
Tue, 25 Jul 2017 01:13:23 +0000 (18:13 -0700)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 28 Jul 2017 14:47:48 +0000 (17:47 +0300)
In reading through _mwifiex_fw_dpc(), I noticed that after we've
registered our wiphy, we still have error paths that don't free it back
up. Let's do that.

Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/marvell/mwifiex/main.c

index 77e4917..0448dcc 100644 (file)
@@ -588,7 +588,7 @@ static int _mwifiex_fw_dpc(const struct firmware *firmware, void *context)
        if (mwifiex_init_channel_scan_gap(adapter)) {
                mwifiex_dbg(adapter, ERROR,
                            "could not init channel stats table\n");
-               goto err_init_fw;
+               goto err_init_chan_scan;
        }
 
        if (driver_mode) {
@@ -636,6 +636,7 @@ static int _mwifiex_fw_dpc(const struct firmware *firmware, void *context)
 
 err_add_intf:
        vfree(adapter->chan_stats);
+err_init_chan_scan:
        wiphy_unregister(adapter->wiphy);
        wiphy_free(adapter->wiphy);
 err_init_fw: