staging: wfx: fix an error handling in wfx_init_common()
[ Upstream commit 60f1d3c92dc1ef1026e5b917a329a7fa947da036 ] 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: Jérôme Pouiller <jerome.pouiller@silabs.com> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Jérôme Pouiller <jerome.pouiller@silabs.com> Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com> Link: https://lore.kernel.org/r/tencent_24A24A3EFF61206ECCC4B94B1C5C1454E108@qq.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
8f1d24f85f
commit
93498c6e77
@@ -309,7 +309,8 @@ struct wfx_dev *wfx_init_common(struct device *dev,
|
||||
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");
|
||||
|
||||
@@ -328,6 +329,10 @@ struct wfx_dev *wfx_init_common(struct device *dev,
|
||||
return NULL;
|
||||
|
||||
return wdev;
|
||||
|
||||
err:
|
||||
ieee80211_free_hw(hw);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int wfx_probe(struct wfx_dev *wdev)
|
||||
|
Reference in New Issue
Block a user