From: Arend van Spriel Date: Thu, 9 Feb 2012 20:09:04 +0000 (+0100) Subject: brcm80211: fmac: only return success in brcmf_sdbrcm_bus_init() when true X-Git-Tag: v3.4-rc1~177^2~108^2~39^2~111 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c0e89f084b5089acdfdda1cb45c88896fa0f5139;p=karo-tx-linux.git brcm80211: fmac: only return success in brcmf_sdbrcm_bus_init() when true The function brcmf_sdbrcm_bus_init() always returned success except for firmware download failure. However, also when enabling SDIO function 2 is failing the function should return failure. This patch fixes that. Reviewed-by: Pieter-Paul Giesberts Reviewed-by: Franky (Zhenhui) Lin Signed-off-by: Arend van Spriel Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index b20029e9984c..47a192db36ff 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c @@ -3467,13 +3467,12 @@ static int brcmf_sdbrcm_bus_init(struct device *dev) /* Set bus state according to enable result */ bus_if->state = BRCMF_BUS_DATA; - } - - else { + } else { /* Disable F2 again */ enable = SDIO_FUNC_ENABLE_1; brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx, enable, NULL); + ret = -ENODEV; } /* Restore previous clock setting */ @@ -3481,7 +3480,7 @@ static int brcmf_sdbrcm_bus_init(struct device *dev) SBSDIO_FUNC1_CHIPCLKCSR, saveclk, &err); /* If we didn't come up, turn off backplane clock */ - if (bus_if->state != BRCMF_BUS_DATA) + if (!ret) brcmf_sdbrcm_clkctl(bus, CLK_NONE, false); exit: