Re: [PATCH] brcm80211:Fix error handling in the function brcmf_sdio_htclk
From: Arend van Spriel <hidden>
Date: 2015-10-07 09:49:53
Also in:
linux-wireless, lkml
Hi Nick, On 10/06/2015 04:36 AM, Nicholas Krause wrote:
This fixes error handling in the function brcmf_sdio_htclk to properly check if the call to the function brcmf_sdio_regrb fails in the else if condition where the clkstate is in the CLK_PENDING state in order to avoid incorrect execution of the function brcmf_sdio_htclk when the call to brcmf_sdio_htclk fails by returning a error code here.
This commit message seems a bit overstating the change or I am missing what you mean by incorrect execution here. These functions are pretty low-level and failures are likely SDIO bus errors that are likely persistent. For that reason not every individual call is checked for errors as net result is that device will become inoperable. Regards, Arend
quoted hunk
Signed-off-by: Nicholas Krause <redacted> --- drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 5 +++++ 1 file changed, 5 insertions(+)diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c index f990e3d..030b50a 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c@@ -886,6 +886,11 @@ static int brcmf_sdio_htclk(struct brcmf_sdio *bus, bool on, bool pendok) /* Cancel CA-only interrupt filter */ devctl = brcmf_sdiod_regrb(bus->sdiodev, SBSDIO_DEVICE_CTL, &err); + if (err) { + brcmf_err("Devctl error canceling CA: %d\n", + err); + return -EBADE; + } devctl &= ~SBSDIO_DEVCTL_CA_INT_ONLY; brcmf_sdiod_regwb(bus->sdiodev, SBSDIO_DEVICE_CTL, devctl, &err);