mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
|
From 412dd15c8177d93abe0c8787b83b31c5eb061405 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Arnd Bergmann <arnd@arndb.de>
|
||
|
|
Date: Mon, 10 Dec 2018 21:55:37 +0100
|
||
|
|
Subject: [PATCH] brcmfmac: fix false-positive -Wmaybe-unintialized warning
|
||
|
|
|
||
|
|
When CONFIG_NO_AUTO_INLINE is set, we get a false-postive warning
|
||
|
|
for the brcmf_fw_request_nvram_done() function, after gcc figures
|
||
|
|
out that brcmf_fw_nvram_from_efi() might not set the 'data_len'
|
||
|
|
variable, but fails to notice that it always returns NULL:
|
||
|
|
|
||
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c: In function 'brcmf_fw_request_nvram_done':
|
||
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c:560:11: error: 'data_len' may be used uninitialized in this function [-Werror=maybe-uninitialized]
|
||
|
|
|
||
|
|
Mark it 'inline' to force gcc to understand this.
|
||
|
|
|
||
|
|
Fixes: ce2e6db554fa ("brcmfmac: Add support for getting nvram contents from EFI variables")
|
||
|
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
||
|
|
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
||
|
|
---
|
||
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||
|
|
@@ -512,7 +512,7 @@ fail:
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
#else
|
||
|
|
-static u8 *brcmf_fw_nvram_from_efi(size_t *data_len) { return NULL; }
|
||
|
|
+static inline u8 *brcmf_fw_nvram_from_efi(size_t *data_len) { return NULL; }
|
||
|
|
#endif
|
||
|
|
|
||
|
|
static void brcmf_fw_free_request(struct brcmf_fw_request *req)
|