From 65d6a2b46127834ed3b573e280a4013ade623e77 Mon Sep 17 00:00:00 2001 From: Michael Trimarchi Date: Sat, 11 Jun 2022 19:58:39 +0200 Subject: [PATCH 100/296] net: brcm80211: Fix race on timer_add in wifi driver brcmf_sdio_wd_timer must be protected using the sdio_claim_host and sdio_release_host Signed-off-by: Michael Trimarchi --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 704ddd58f185..834595077322 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -4785,11 +4785,10 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err, goto checkdied; } - sdio_release_host(sdiod->func1); - /* Start the watchdog timer */ bus->sdcnt.tickcnt = 0; brcmf_sdio_wd_timer(bus, true); + sdio_release_host(sdiod->func1); err = brcmf_alloc(sdiod->dev, sdiod->settings); if (err) { -- 2.25.1