From: Greg Kroah-Hartman Date: Mon, 13 Jun 2022 07:10:18 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v4.9.318~63 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8847352b6bc63cb2bb193ecbc1896fb208c4aecd;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: alsa-hda-conexant-fix-loopback-issue-with-cx20632.patch cifs-return-errors-during-session-setup-during-reconnects.patch --- diff --git a/queue-4.19/alsa-hda-conexant-fix-loopback-issue-with-cx20632.patch b/queue-4.19/alsa-hda-conexant-fix-loopback-issue-with-cx20632.patch new file mode 100644 index 00000000000..1bf27aae1ae --- /dev/null +++ b/queue-4.19/alsa-hda-conexant-fix-loopback-issue-with-cx20632.patch @@ -0,0 +1,37 @@ +From d5ea7544c32ba27c2c5826248e4ff58bd50a2518 Mon Sep 17 00:00:00 2001 +From: huangwenhui +Date: Tue, 7 Jun 2022 14:56:31 +0800 +Subject: ALSA: hda/conexant - Fix loopback issue with CX20632 + +From: huangwenhui + +commit d5ea7544c32ba27c2c5826248e4ff58bd50a2518 upstream. + +On a machine with CX20632, Alsamixer doesn't have 'Loopback +Mixing' and 'Line'. + +Signed-off-by: huangwenhui +Cc: +Link: https://lore.kernel.org/r/20220607065631.10708-1-huangwenhuia@uniontech.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_conexant.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/sound/pci/hda/patch_conexant.c ++++ b/sound/pci/hda/patch_conexant.c +@@ -1025,6 +1025,13 @@ static int patch_conexant_auto(struct hd + snd_hda_pick_fixup(codec, cxt5051_fixup_models, + cxt5051_fixups, cxt_fixups); + break; ++ case 0x14f15098: ++ codec->pin_amp_workaround = 1; ++ spec->gen.mixer_nid = 0x22; ++ spec->gen.add_stereo_mix_input = HDA_HINT_STEREO_MIX_AUTO; ++ snd_hda_pick_fixup(codec, cxt5066_fixup_models, ++ cxt5066_fixups, cxt_fixups); ++ break; + case 0x14f150f2: + codec->power_save_node = 1; + /* Fall through */ diff --git a/queue-4.19/cifs-return-errors-during-session-setup-during-reconnects.patch b/queue-4.19/cifs-return-errors-during-session-setup-during-reconnects.patch new file mode 100644 index 00000000000..e397f5ad791 --- /dev/null +++ b/queue-4.19/cifs-return-errors-during-session-setup-during-reconnects.patch @@ -0,0 +1,37 @@ +From 8ea21823aa584b55ba4b861307093b78054b0c1b Mon Sep 17 00:00:00 2001 +From: Shyam Prasad N +Date: Tue, 31 May 2022 12:31:05 +0000 +Subject: cifs: return errors during session setup during reconnects + +From: Shyam Prasad N + +commit 8ea21823aa584b55ba4b861307093b78054b0c1b upstream. + +During reconnects, we check the return value from +cifs_negotiate_protocol, and have handlers for both success +and failures. But if that passes, and cifs_setup_session +returns any errors other than -EACCES, we do not handle +that. This fix adds a handler for that, so that we don't +go ahead and try a tree_connect on a failed session. + +Signed-off-by: Shyam Prasad N +Reviewed-by: Enzo Matsumiya +Cc: stable@vger.kernel.org +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman +--- + fs/cifs/smb2pdu.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/fs/cifs/smb2pdu.c ++++ b/fs/cifs/smb2pdu.c +@@ -265,6 +265,9 @@ smb2_reconnect(__le16 smb2_command, stru + rc = -EHOSTDOWN; + mutex_unlock(&tcon->ses->session_mutex); + goto failed; ++ } else if (rc) { ++ mutex_unlock(&ses->session_mutex); ++ goto out; + } + } + if (rc || !tcon->need_reconnect) { diff --git a/queue-4.19/series b/queue-4.19/series index abee44171f2..f81e20acfa1 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -273,3 +273,5 @@ nbd-fix-race-between-nbd_alloc_config-and-module-rem.patch nbd-fix-io-hung-while-disconnecting-device.patch nodemask-fix-return-values-to-be-unsigned.patch vringh-fix-loop-descriptors-check-in-the-indirect-ca.patch +alsa-hda-conexant-fix-loopback-issue-with-cx20632.patch +cifs-return-errors-during-session-setup-during-reconnects.patch