diff options
| author | Javier Carrasco <javier.carrasco.cruz@gmail.com> | 2024-10-30 18:34:45 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2024-11-11 13:07:24 +0100 |
| commit | 2e19a3b590ebf2e351fc9d0e7c323430e65b6b6d (patch) | |
| tree | 112c5ea00667cdc72d9cc17e236568c2afb69436 /drivers/net/wireless | |
| parent | Merge tag 'rtw-next-2024-11-06' of https://github.com/pkshih/rtw (diff) | |
| download | linux-2e19a3b590ebf2e351fc9d0e7c323430e65b6b6d.tar.xz linux-2e19a3b590ebf2e351fc9d0e7c323430e65b6b6d.zip | |
wifi: brcmfmac: release 'root' node in all execution paths
The fixed patch introduced an additional condition to enter the scope
where the 'root' device_node is released (!settings->board_type,
currently 'err'), which avoid decrementing the refcount with a call to
of_node_put() if that second condition is not satisfied.
Move the call to of_node_put() to the point where 'root' is no longer
required to avoid leaking the resource if err is not zero.
Cc: stable@vger.kernel.org
Fixes: 7682de8b3351 ("wifi: brcmfmac: of: Fetch Apple properties")
Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20241030-brcmfmac-of-cleanup-v1-1-0b90eefb4279@gmail.com
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c index ae98e371dbfd..c1f18e2fe540 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c @@ -112,9 +112,8 @@ int brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type, } strreplace(board_type, '/', '-'); settings->board_type = board_type; - - of_node_put(root); } + of_node_put(root); clk = devm_clk_get_optional_enabled_with_rate(dev, "lpo", 32768); if (IS_ERR(clk)) |