From 5742bc238b442bb96d900ce1474a16c078012f42 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 19 Dec 2022 13:38:03 +0100 Subject: [PATCH] 6.1-stable patches added patches: alsa-hda-realtek-fix-mute-micmute-leds-for-a-hp-probook.patch usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch --- ...x-mute-micmute-leds-for-a-hp-probook.patch | 33 ++++++++++++ queue-6.1/series | 3 ++ ...ivision-by-zero-on-line-speed-change.patch | 52 +++++++++++++++++++ ...ivision-by-zero-on-line-speed-change.patch | 52 +++++++++++++++++++ 4 files changed, 140 insertions(+) create mode 100644 queue-6.1/alsa-hda-realtek-fix-mute-micmute-leds-for-a-hp-probook.patch create mode 100644 queue-6.1/usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch create mode 100644 queue-6.1/usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch diff --git a/queue-6.1/alsa-hda-realtek-fix-mute-micmute-leds-for-a-hp-probook.patch b/queue-6.1/alsa-hda-realtek-fix-mute-micmute-leds-for-a-hp-probook.patch new file mode 100644 index 00000000000..01d1777a058 --- /dev/null +++ b/queue-6.1/alsa-hda-realtek-fix-mute-micmute-leds-for-a-hp-probook.patch @@ -0,0 +1,33 @@ +From 1d8025ec722d5e011f9299c46274eb21fb54a428 Mon Sep 17 00:00:00 2001 +From: Andy Chi +Date: Mon, 28 Nov 2022 10:28:47 +0800 +Subject: ALSA: hda/realtek: fix mute/micmute LEDs for a HP ProBook + +From: Andy Chi + +commit 1d8025ec722d5e011f9299c46274eb21fb54a428 upstream. + +There is a HP ProBook which using ALC236 codec and need the +ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF quirk to make mute LED and +micmute LED work. + +Signed-off-by: Andy Chi +Cc: +Link: https://lore.kernel.org/r/20221128022849.13759-1-andy.chi@canonical.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -9354,6 +9354,8 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x103c, 0x8abb, "HP ZBook Firefly 14 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8ad1, "HP EliteBook 840 14 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8ad2, "HP EliteBook 860 16 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED), ++ SND_PCI_QUIRK(0x103c, 0x8b5d, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), ++ SND_PCI_QUIRK(0x103c, 0x8b5e, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), + SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC), + SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300), + SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), diff --git a/queue-6.1/series b/queue-6.1/series index 814f821d718..b6ac1bd3b12 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -12,3 +12,6 @@ udf-fix-extending-file-within-last-block.patch usb-gadget-uvc-prevent-buffer-overflow-in-setup-handler.patch usb-serial-option-add-quectel-em05-g-modem.patch usb-serial-cp210x-add-kamstrup-rf-sniffer-pids.patch +usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch +usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch +alsa-hda-realtek-fix-mute-micmute-leds-for-a-hp-probook.patch diff --git a/queue-6.1/usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch b/queue-6.1/usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch new file mode 100644 index 00000000000..ada35308f37 --- /dev/null +++ b/queue-6.1/usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch @@ -0,0 +1,52 @@ +From a08ca6ebafe615c9028c53fc4c9e6c9b2b1f2888 Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Tue, 29 Nov 2022 15:17:49 +0100 +Subject: USB: serial: f81232: fix division by zero on line-speed change + +From: Johan Hovold + +commit a08ca6ebafe615c9028c53fc4c9e6c9b2b1f2888 upstream. + +The driver leaves the line speed unchanged in case a requested speed is +not supported. Make sure to handle the case where the current speed is +B0 (hangup) without dividing by zero when determining the clock source. + +Fixes: 268ddb5e9b62 ("USB: serial: f81232: add high baud rate support") +Cc: stable@vger.kernel.org # 5.2 +Cc: Ji-Ze Hong (Peter Hong) +Reviewed-by: Greg Kroah-Hartman +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/f81232.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +--- a/drivers/usb/serial/f81232.c ++++ b/drivers/usb/serial/f81232.c +@@ -130,9 +130,6 @@ static u8 const clock_table[] = { F81232 + + static int calc_baud_divisor(speed_t baudrate, speed_t clockrate) + { +- if (!baudrate) +- return 0; +- + return DIV_ROUND_CLOSEST(clockrate, baudrate); + } + +@@ -498,9 +495,14 @@ static void f81232_set_baudrate(struct t + speed_t baud_list[] = { baudrate, old_baudrate, F81232_DEF_BAUDRATE }; + + for (i = 0; i < ARRAY_SIZE(baud_list); ++i) { +- idx = f81232_find_clk(baud_list[i]); ++ baudrate = baud_list[i]; ++ if (baudrate == 0) { ++ tty_encode_baud_rate(tty, 0, 0); ++ return; ++ } ++ ++ idx = f81232_find_clk(baudrate); + if (idx >= 0) { +- baudrate = baud_list[i]; + tty_encode_baud_rate(tty, baudrate, baudrate); + break; + } diff --git a/queue-6.1/usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch b/queue-6.1/usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch new file mode 100644 index 00000000000..3101ee02824 --- /dev/null +++ b/queue-6.1/usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch @@ -0,0 +1,52 @@ +From 188c9c2e0c7f4ae864113f80c40bafb394062271 Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Tue, 29 Nov 2022 15:18:19 +0100 +Subject: USB: serial: f81534: fix division by zero on line-speed change + +From: Johan Hovold + +commit 188c9c2e0c7f4ae864113f80c40bafb394062271 upstream. + +The driver leaves the line speed unchanged in case a requested speed is +not supported. Make sure to handle the case where the current speed is +B0 (hangup) without dividing by zero when determining the clock source. + +Fixes: 3aacac02f385 ("USB: serial: f81534: add high baud rate support") +Cc: stable@vger.kernel.org # 4.16 +Cc: Ji-Ze Hong (Peter Hong) +Reviewed-by: Greg Kroah-Hartman +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/f81534.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +--- a/drivers/usb/serial/f81534.c ++++ b/drivers/usb/serial/f81534.c +@@ -536,9 +536,6 @@ static int f81534_submit_writer(struct u + + static u32 f81534_calc_baud_divisor(u32 baudrate, u32 clockrate) + { +- if (!baudrate) +- return 0; +- + /* Round to nearest divisor */ + return DIV_ROUND_CLOSEST(clockrate, baudrate); + } +@@ -568,9 +565,14 @@ static int f81534_set_port_config(struct + u32 baud_list[] = {baudrate, old_baudrate, F81534_DEFAULT_BAUD_RATE}; + + for (i = 0; i < ARRAY_SIZE(baud_list); ++i) { +- idx = f81534_find_clk(baud_list[i]); ++ baudrate = baud_list[i]; ++ if (baudrate == 0) { ++ tty_encode_baud_rate(tty, 0, 0); ++ return 0; ++ } ++ ++ idx = f81534_find_clk(baudrate); + if (idx >= 0) { +- baudrate = baud_list[i]; + tty_encode_baud_rate(tty, baudrate, baudrate); + break; + } -- 2.47.3