[PATCH 07/14] mwifiex: fixup init_channel_scan_gap error case

From	Brian Norris <briannorris@chromium.org>
Newsgroups	linux.kernel
Subject	[PATCH 07/14] mwifiex: fixup init_channel_scan_gap error case
Date	2017-05-25 02:20 +0200
Message-ID	<tKOFs-Qx-11@gated-at.bofh.it> (permalink)
References	<tKOFr-Qx-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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>
---
 drivers/net/wireless/marvell/mwifiex/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index be3badba028a..c6cdbc311471 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -584,7 +584,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) {
@@ -632,6 +632,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:
-- 
2.13.0.219.gdb65acc882-goog

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 07/14] mwifiex: fixup init_channel_scan_gap error case Brian Norris <briannorris@chromium.org> - 2017-05-25 02:20 +0200

csiph-web