--- /dev/null
+From guillaume.bertholon@ens.fr Fri Feb 11 12:55:57 2022
+From: Guillaume Bertholon <guillaume.bertholon@ens.fr>
+Date: Tue, 8 Feb 2022 17:31:15 +0100
+Subject: ALSA: line6: Fix misplaced backport of "Fix wrong altsetting for LINE6_PODHD500_1"
+To: gregkh@linuxfoundation.org
+Cc: guillaume.bertholon@ens.fr, stable@vger.kernel.org
+Message-ID: <1644337875-22219-1-git-send-email-guillaume.bertholon@ens.fr>
+
+From: Guillaume Bertholon <guillaume.bertholon@ens.fr>
+
+The upstream commit 70256b42caaf ("ALSA: line6: Fix wrong altsetting for
+LINE6_PODHD500_1") changed the .altsetting field of the LINE6_PODHD500_1
+entry in podhd_properties_table from 1 to 0.
+
+However, its backported version in stable (commit ec565611f930 ("ALSA:
+line6: Fix wrong altsetting for LINE6_PODHD500_1")) change the
+.altsetting field of the LINE6_PODHD500_0 entry instead.
+
+This patch resets the altsetting of LINE6_PODHD500_0 to 1, and sets the
+altsetting of LINE6_PODHD500_1 to 0, as wanted by the original fix.
+
+Fixes: ec565611f930 ("ALSA: line6: Fix wrong altsetting for LINE6_PODHD500_1")
+Signed-off-by: Guillaume Bertholon <guillaume.bertholon@ens.fr>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/usb/line6/podhd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/sound/usb/line6/podhd.c
++++ b/sound/usb/line6/podhd.c
+@@ -385,7 +385,7 @@ static const struct line6_properties pod
+ .name = "POD HD500",
+ .capabilities = LINE6_CAP_PCM
+ | LINE6_CAP_HWMON,
+- .altsetting = 0,
++ .altsetting = 1,
+ .ep_ctrl_r = 0x81,
+ .ep_ctrl_w = 0x01,
+ .ep_audio_r = 0x86,
+@@ -396,7 +396,7 @@ static const struct line6_properties pod
+ .name = "POD HD500",
+ .capabilities = LINE6_CAP_PCM
+ | LINE6_CAP_HWMON,
+- .altsetting = 1,
++ .altsetting = 0,
+ .ep_ctrl_r = 0x81,
+ .ep_ctrl_w = 0x01,
+ .ep_audio_r = 0x86,
--- /dev/null
+From guillaume.bertholon@ens.fr Fri Feb 11 12:55:16 2022
+From: Guillaume Bertholon <guillaume.bertholon@ens.fr>
+Date: Tue, 8 Feb 2022 17:33:02 +0100
+Subject: Input: i8042 - Fix misplaced backport of "add ASUS Zenbook Flip to noselftest list"
+To: gregkh@linuxfoundation.org
+Cc: guillaume.bertholon@ens.fr, stable@vger.kernel.org
+Message-ID: <1644337982-23738-1-git-send-email-guillaume.bertholon@ens.fr>
+
+From: Guillaume Bertholon <guillaume.bertholon@ens.fr>
+
+The upstream commit b5d6e7ab7fe7 ("Input: i8042 - add ASUS Zenbook Flip to
+noselftest list") inserted a new entry in the `i8042_dmi_noselftest_table`
+table, further patched by commit daa58c8eec0a ("Input: i8042 - fix Pegatron
+C15B ID entry") to insert a missing separator.
+
+However, their backported version in stable (commit e9e8b3769099
+("Input: i8042 - add ASUS Zenbook Flip to noselftest list") and
+commit c551d20d487a ("Input: i8042 - fix Pegatron C15B ID entry"))
+inserted this entry in `i8042_dmi_forcemux_table` instead.
+
+This patch moves the entry back into `i8042_dmi_noselftest_table`.
+
+Fixes: e9e8b3769099 ("Input: i8042 - add ASUS Zenbook Flip to noselftest list")
+Signed-off-by: Guillaume Bertholon <guillaume.bertholon@ens.fr>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/input/serio/i8042-x86ia64io.h | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+--- a/drivers/input/serio/i8042-x86ia64io.h
++++ b/drivers/input/serio/i8042-x86ia64io.h
+@@ -586,11 +586,6 @@ static const struct dmi_system_id i8042_
+ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "VGN-CS"),
+ },
+- }, {
+- .matches = {
+- DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+- DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */
+- },
+ },
+ { }
+ };
+@@ -677,6 +672,12 @@ static const struct dmi_system_id i8042_
+ DMI_MATCH(DMI_PRODUCT_NAME, "Z450LA"),
+ },
+ },
++ {
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
++ DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */
++ },
++ },
+ { }
+ };
+ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
--- /dev/null
+From guillaume.bertholon@ens.fr Fri Feb 11 12:55:35 2022
+From: Guillaume Bertholon <guillaume.bertholon@ens.fr>
+Date: Tue, 8 Feb 2022 17:33:56 +0100
+Subject: serial: sh-sci: Fix misplaced backport of "Fix late enablement of AUTORTS"
+To: gregkh@linuxfoundation.org
+Cc: guillaume.bertholon@ens.fr, stable@vger.kernel.org
+Message-ID: <1644338036-24080-1-git-send-email-guillaume.bertholon@ens.fr>
+
+From: Guillaume Bertholon <guillaume.bertholon@ens.fr>
+
+The upstream commit 5f76895e4c71 ("serial: sh-sci: Fix late enablement of
+AUTORTS") inserted a new call to .set_mctrl().
+However the backported version in stable (commit ad3faea03fdf ("serial:
+sh-sci: Fix late enablement of AUTORTS")) does not insert it at the same
+position.
+
+This patch moves the added instructions back to where they should be
+according to the upsteam patch.
+
+Fixes: ad3faea03fdf ("serial: sh-sci: Fix late enablement of AUTORTS")
+Signed-off-by: Guillaume Bertholon <guillaume.bertholon@ens.fr>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/tty/serial/sh-sci.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/tty/serial/sh-sci.c
++++ b/drivers/tty/serial/sh-sci.c
+@@ -2377,6 +2377,10 @@ done:
+
+ serial_port_out(port, SCFCR, ctrl);
+ }
++ if (port->flags & UPF_HARD_FLOW) {
++ /* Refresh (Auto) RTS */
++ sci_set_mctrl(port, port->mctrl);
++ }
+
+ scr_val |= s->cfg->scscr & ~(SCSCR_CKE1 | SCSCR_CKE0);
+ dev_dbg(port->dev, "SCSCR 0x%x\n", scr_val);
+@@ -2391,10 +2395,6 @@ done:
+ */
+ udelay(DIV_ROUND_UP(10 * 1000000, baud));
+ }
+- if (port->flags & UPF_HARD_FLOW) {
+- /* Refresh (Auto) RTS */
+- sci_set_mctrl(port, port->mctrl);
+- }
+
+ #ifdef CONFIG_SERIAL_SH_SCI_DMA
+ /*
ima-remove-ima_policy-file-before-directory.patch
nfs-fix-initialisation-of-nfs_client-cl_flags-field.patch
nfsd-clamp-write-offsets.patch
+input-i8042-fix-misplaced-backport-of-add-asus-zenbook-flip-to-noselftest-list.patch
+serial-sh-sci-fix-misplaced-backport-of-fix-late-enablement-of-autorts.patch
+alsa-line6-fix-misplaced-backport-of-fix-wrong-altsetting-for-line6_podhd500_1.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
