diff options
author | Tong Tiangen <tongtiangen@huawei.com> | 2021-06-01 18:01:28 +0800 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2021-06-15 13:37:31 +0300 |
commit | 7ea7a1e05c7ff5ffc9f9ec1f0849f6ceb7fcd57c (patch) | |
tree | fe8ff77c3e651bd1e85a6b7444b12ce37aa13759 /drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | |
parent | ea3f903caea08bbda8a5d4e86d1d24f50af40b5e (diff) |
brcmfmac: Fix a double-free in brcmf_sdio_bus_reset
brcmf_sdiod_remove has been called inside brcmf_sdiod_probe when fails,
so there's no need to call another one. Otherwise, sdiodev->freezer
would be double freed.
Fixes: 7836102a750a ("brcmfmac: reset SDIO bus on a firmware crash")
Signed-off-by: Tong Tiangen <tongtiangen@huawei.com>
Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210601100128.69561-1-tongtiangen@huawei.com
Diffstat (limited to 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c')
-rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index d1dda851e176..27eb83ee2dc9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -4162,7 +4162,6 @@ static int brcmf_sdio_bus_reset(struct device *dev) if (ret) { brcmf_err("Failed to probe after sdio device reset: ret %d\n", ret); - brcmf_sdiod_remove(sdiodev); } return ret; |