lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: brcmfmac: Fix error return code in brcmf_sdio_download_firmware()

Browse Source 
[ Upstream commit c2f2924bc7f9ea75ef8d95863e710168f8196256 ]

Fix to return a negative error code instead of 0 when
brcmf_chip_set_active() fails. In addition, change the return
value for brcmf_pcie_exit_download_state() to keep consistent.

Fixes: d380ebc9b6 ("brcmfmac: rename chip download functions")
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/1669959342-27144-1-git-send-email-wangyufen@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Wang Yufen 2022-12-02 13:35:42 +08:00 committed by Greg Kroah-Hartman
parent 1a49bba59d
commit d628d5c5b4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
View File

@ -616,7 +616,7 @@ static int brcmf_pcie_exit_download_state(struct brcmf_pciedev_info *devinfo,
} }
if (!brcmf_chip_set_active(devinfo->ci, resetintr)) if (!brcmf_chip_set_active(devinfo->ci, resetintr))
return -EINVAL; return -EIO;
return 0; return 0;
} }

1
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
View File

@ -3367,6 +3367,7 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus,
/* Take arm out of reset */ /* Take arm out of reset */
if (!brcmf_chip_set_active(bus->ci, rstvec)) { if (!brcmf_chip_set_active(bus->ci, rstvec)) {
brcmf_err("error getting out of ARM core reset\n"); brcmf_err("error getting out of ARM core reset\n");
bcmerror = -EIO;
goto err; goto err;
} }