33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
From c9692820710f57c826b2e43a6fb1e4cd307508b0 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Tue, 26 Feb 2019 14:11:16 +0100
|
|
Subject: [PATCH] brcmfmac: support repeated brcmf_fw_alloc_request() calls
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
During a normal brcmfmac lifetime brcmf_fw_alloc_request() is called
|
|
once only during the probe. It's safe to assume provided array is clear.
|
|
|
|
Further brcmfmac improvements may require calling it multiple times
|
|
though. This patch allows it by fixing invalid firmware paths like:
|
|
brcm/brcmfmac4366c-pcie.binbrcm/brcmfmac4366c-pcie.bin
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
|
@@ -743,6 +743,7 @@ brcmf_fw_alloc_request(u32 chip, u32 chi
|
|
|
|
for (j = 0; j < n_fwnames; j++) {
|
|
fwreq->items[j].path = fwnames[j].path;
|
|
+ fwnames[j].path[0] = '\0';
|
|
/* check if firmware path is provided by module parameter */
|
|
if (brcmf_mp_global.firmware_path[0] != '\0') {
|
|
strlcpy(fwnames[j].path, mp_path,
|