From: Greg Kroah-Hartman Date: Thu, 23 Feb 2023 10:40:28 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v6.2.1~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df22a28363bc6313f0348fa66920698844a1d746;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: wifi-mwifiex-add-missing-compatible-string-for-sd8787.patch --- diff --git a/queue-4.14/series b/queue-4.14/series index c0c09677636..288a4a0f2bc 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -6,3 +6,4 @@ netfilter-conntrack-fix-bug-in-for_each_sctp_chunk.patch revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch alarmtimer-prevent-starvation-by-small-intervals-and-sig_ign.patch uaccess-add-speculation-barrier-to-copy_from_user.patch +wifi-mwifiex-add-missing-compatible-string-for-sd8787.patch diff --git a/queue-4.14/wifi-mwifiex-add-missing-compatible-string-for-sd8787.patch b/queue-4.14/wifi-mwifiex-add-missing-compatible-string-for-sd8787.patch new file mode 100644 index 00000000000..f08c6b612c9 --- /dev/null +++ b/queue-4.14/wifi-mwifiex-add-missing-compatible-string-for-sd8787.patch @@ -0,0 +1,34 @@ +From 36dd7a4c6226133b0b7aa92b8e604e688d958d0c Mon Sep 17 00:00:00 2001 +From: Lukas Wunner +Date: Fri, 27 Jan 2023 15:01:00 +0100 +Subject: wifi: mwifiex: Add missing compatible string for SD8787 + +From: Lukas Wunner + +commit 36dd7a4c6226133b0b7aa92b8e604e688d958d0c upstream. + +Commit e3fffc1f0b47 ("devicetree: document new marvell-8xxx and +pwrseq-sd8787 options") documented a compatible string for SD8787 in +the devicetree bindings, but neglected to add it to the mwifiex driver. + +Fixes: e3fffc1f0b47 ("devicetree: document new marvell-8xxx and pwrseq-sd8787 options") +Signed-off-by: Lukas Wunner +Cc: stable@vger.kernel.org # v4.11+ +Cc: Matt Ranostay +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/320de5005ff3b8fd76be2d2b859fd021689c3681.1674827105.git.lukas@wunner.de +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/marvell/mwifiex/sdio.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/wireless/marvell/mwifiex/sdio.c ++++ b/drivers/net/wireless/marvell/mwifiex/sdio.c +@@ -58,6 +58,7 @@ static struct memory_type_mapping mem_ty + }; + + static const struct of_device_id mwifiex_sdio_of_match_table[] = { ++ { .compatible = "marvell,sd8787" }, + { .compatible = "marvell,sd8897" }, + { .compatible = "marvell,sd8997" }, + { }