This is a note to let you know that I've just added the patch titled
wifi: brcmfmac: fix up incorrect 4.14.y backport for brcmf_fw_map_chip_to_name()
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
wifi-brcmfmac-fix-up-incorrect-4.14.y-backport-for-brcmf_fw_map_chip_to_name.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>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@xxxxxxxxxxxxxxxxxxx>
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Subject: wifi: brcmfmac: fix up incorrect 4.14.y backport for brcmf_fw_map_chip_to_name()
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxx>
Cc: Dokyung Song <dokyungs@xxxxxxxxxxxx>
Cc: Jisoo Jang <jisoo.jang@xxxxxxxxxxxx>
Cc: Minsuk Kang <linuxlovemin@xxxxxxxxxxxx>
Cc: Kalle Valo <kvalo@xxxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Link: https://lore.kernel.org/r/Y8gccXXyE30sbPSg@dev-arch.thelio-3990X
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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++) {
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-4.14/x86-i8259-mark-legacy-pic-interrupts-with-irq_level.patch
queue-4.14/revert-input-synaptics-switch-touchpad-on-hp-laptop-15-da3001tu-to-rmi-mode.patch
queue-4.14/fs-reiserfs-remove-useless-new_opts-in-reiserfs_remount.patch
queue-4.14/wifi-brcmfmac-fix-up-incorrect-4.14.y-backport-for-brcmf_fw_map_chip_to_name.patch
queue-4.14/module-don-t-wait-for-going-modules.patch
queue-4.14/edac-device-respect-any-driver-supplied-workqueue-polling-value.patch
queue-4.14/w1-fix-warning-after-calling-w1_process.patch
queue-4.14/comedi-adv_pci1760-fix-pwm-instruction-handling.patch
queue-4.14/w1-fix-deadloop-in-__w1_remove_master_device.patch
queue-4.14/usb-gadget-f_fs-prevent-race-during-ffs_ep0_queue_wa.patch
queue-4.14/usb-gadget-f_fs-ensure-ep0req-is-dequeued-before-fre.patch
queue-4.14/tracing-make-sure-trace_printk-can-output-as-soon-as-it-can-be-used.patch
queue-4.14/arm-9280-1-mm-fix-warning-on-phys_addr_t-to-void-pointer-assignment.patch
