Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba2d8d67 authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Greg Kroah-Hartman
Browse files

brcmfmac: use firmware callback upon failure to load 



commit 03fb0e8393fae8ebb6710a99387853ed0becbc8e upstream.

When firmware loading failed the code used to unbind the device provided
by the calling code. However, for the sdio driver two devices are bound
and both need to be released upon failure. The callback has been extended
with parameter to pass error code so add that in this commit upon firmware
loading failure.

Reviewed-by: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1dd15bd6

drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c

+13 −14
Original line number Diff line number Diff line
@@ -484,39 +484,38 @@ static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx) 
fail:

	brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));

	release_firmware(fwctx->code);

	device_release_driver(fwctx->dev);

	fwctx->done(fwctx->dev, -ENOENT, NULL, NULL, 0);

	kfree(fwctx);

}



static void brcmf_fw_request_code_done(const struct firmware *fw, void *ctx)

{

	struct brcmf_fw *fwctx = ctx;

	int ret;

	int ret = 0;



	brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(fwctx->dev));

	if (!fw)

	if (!fw) {

		ret = -ENOENT;

		goto fail;



	/* only requested code so done here */

	if (!(fwctx->flags & BRCMF_FW_REQUEST_NVRAM)) {

		fwctx->done(fwctx->dev, 0, fw, NULL, 0);

		kfree(fwctx);

		return;

	}

	/* only requested code so done here */

	if (!(fwctx->flags & BRCMF_FW_REQUEST_NVRAM))

		goto done;



	fwctx->code = fw;

	ret = request_firmware_nowait(THIS_MODULE, true, fwctx->nvram_name,

				      fwctx->dev, GFP_KERNEL, fwctx,

				      brcmf_fw_request_nvram_done);



	if (!ret)

		return;



	/* pass NULL to nvram callback for bcm47xx fallback */

	if (ret)

		brcmf_fw_request_nvram_done(NULL, fwctx);

	return;



fail:

	brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));

	device_release_driver(fwctx->dev);

done:

	fwctx->done(fwctx->dev, ret, fw, NULL, 0);

	kfree(fwctx);

}