brcm80211: fmac: only return success in brcmf_sdbrcm_bus_init() when true (c0e89f08) · Commits · 戴 / test

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 <pieterpg@broadcom.com> Reviewed-by:

Franky (Zhenhui) Lin <frankyl@broadcom.com> Signed-off-by:

Arend van Spriel <arend@broadcom.com> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -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:

Admin message