2002-brcmfmac-USB-probing-provides-no-board-type.patch

From 536bc0ac809b92a671209bcc70cef4fe2c36a1d7 Mon Sep 17 00:00:00 2001
From: Dragan Simic <dragan.simic@gmail.com>
Date: Sun, 21 Nov 2021 07:41:48 +0100
Subject: [PATCH] brcmfmac: USB probing provides no board type

---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
index 0eb13e5df517..6ab7bc0265c5 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
@@ -597,12 +597,16 @@ static char *brcm_alt_fw_path(const char *path, const char *board_type)
 	char alt_path[BRCMF_FW_NAME_LEN];
 	char suffix[5];
 
+	/* USB probing provides no board type */
+	if (!board_type)
+		return NULL;
+
 	strscpy(alt_path, path, BRCMF_FW_NAME_LEN);
 	/* At least one character + suffix */
 	if (strlen(alt_path) < 5)
 		return NULL;
 
-	/* strip .txt or .bin at the end */
+	/* Strip .txt or .bin at the end */
 	strscpy(suffix, alt_path + strlen(alt_path) - 4, 5);
 	alt_path[strlen(alt_path) - 4] = 0;
 	strlcat(alt_path, ".", BRCMF_FW_NAME_LEN);
-- 
2.33.1