Commit 60f1d3c9 authored by Xiaoke Wang's avatar Xiaoke Wang Committed by Greg Kroah-Hartman
Browse files

staging: wfx: fix an error handling in wfx_init_common() 



One error handler of wfx_init_common() return without calling
ieee80211_free_hw(hw), which may result in memory leak. And I add
one err label to unify the error handler, which is useful for the
subsequent changes.

Suggested-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Signed-off-by: default avatarXiaoke Wang <xkernel.wang@foxmail.com>
Link: https://lore.kernel.org/r/tencent_24A24A3EFF61206ECCC4B94B1C5C1454E108@qq.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f3c2a77

drivers/staging/wfx/main.c

+6 −1
Original line number Diff line number Diff line
@@ -305,7 +305,8 @@ struct wfx_dev *wfx_init_common(struct device *dev, const struct wfx_platform_da 
	of_property_read_string(dev->of_node, "silabs,antenna-config-file", &wdev->pdata.file_pds);

	wdev->pdata.gpio_wakeup = devm_gpiod_get_optional(dev, "wakeup", GPIOD_OUT_LOW);

	if (IS_ERR(wdev->pdata.gpio_wakeup))

		return NULL;

		goto err;



	if (wdev->pdata.gpio_wakeup)

		gpiod_set_consumer_name(wdev->pdata.gpio_wakeup, "wfx wakeup");
@@ -322,6 +323,10 @@ struct wfx_dev *wfx_init_common(struct device *dev, const struct wfx_platform_da 
		return NULL;



	return wdev;



err:

	ieee80211_free_hw(hw);

	return NULL;

}



int wfx_probe(struct wfx_dev *wdev)