From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 30 Jan 2023 12:10:39 +0000 (+0100)
Subject: 4.14-stable patches
X-Git-Tag: v5.10.166~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7467d5d27673873149632f9795e79ca218bd25df;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	wifi-brcmfmac-fix-up-incorrect-4.14.y-backport-for-brcmf_fw_map_chip_to_name.patch
---

diff --git a/queue-4.14/series b/queue-4.14/series
index 4018a418af1..2776f6e4703 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -37,3 +37,4 @@ net-ravb-fix-possible-hang-if-ris2_qff1-happen.patch
 net-tg3-resolve-deadlock-in-tg3_reset_task-during-ee.patch
 revert-input-synaptics-switch-touchpad-on-hp-laptop-15-da3001tu-to-rmi-mode.patch
 x86-i8259-mark-legacy-pic-interrupts-with-irq_level.patch
+wifi-brcmfmac-fix-up-incorrect-4.14.y-backport-for-brcmf_fw_map_chip_to_name.patch
diff --git a/queue-4.14/wifi-brcmfmac-fix-up-incorrect-4.14.y-backport-for-brcmf_fw_map_chip_to_name.patch b/queue-4.14/wifi-brcmfmac-fix-up-incorrect-4.14.y-backport-for-brcmf_fw_map_chip_to_name.patch
new file mode 100644
index 00000000000..d7d463163b8
--- /dev/null
+++ b/queue-4.14/wifi-brcmfmac-fix-up-incorrect-4.14.y-backport-for-brcmf_fw_map_chip_to_name.patch
@@ -0,0 +1,35 @@
+From foo@baz Mon Jan 30 01:07:06 PM CET 2023
+Date: Mon, 30 Jan 2023 13:07:06 +0100
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: wifi: brcmfmac: fix up incorrect 4.14.y backport for brcmf_fw_map_chip_to_name()
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+In commit bc45aa1911bf699b9905f12414e3c1879d6b784f which is commit
+81d17f6f3331f03c8eafdacea68ab773426c1e3c upstream, the return value of the
+error condition needs to be reworked to return a real error and not NULL.
+
+Reported-by: Nathan Chancellor <nathan@kernel.org>
+Cc: Dokyung Song <dokyungs@yonsei.ac.kr>
+Cc: Jisoo Jang <jisoo.jang@yonsei.ac.kr>
+Cc: Minsuk Kang <linuxlovemin@yonsei.ac.kr>
+Cc: Kalle Valo <kvalo@kernel.org>
+Cc: Sasha Levin <sashal@kernel.org>
+Link: https://lore.kernel.org/r/Y8gccXXyE30sbPSg@dev-arch.thelio-3990X
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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
+@@ -574,7 +574,7 @@ int brcmf_fw_map_chip_to_name(u32 chip,
+ 
+ 	if (chiprev >= BITS_PER_TYPE(u32)) {
+ 		brcmf_err("Invalid chip revision %u\n", chiprev);
+-		return NULL;
++		return -EINVAL;
+ 	}
+ 
+ 	for (i = 0; i < table_size; i++) {