5.4-stable patches

added patches:
	alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch

diff --git a/queue-5.4/alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch b/queue-5.4/alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch
new file mode 100644 (file)
index 0000000..4a0bff9
--- /dev/null
+++ b/queue-5.4/alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch
@@ -0,0 +1,35 @@
+From a03cfad512ac24a35184d7d87ec0d5489e1cb763 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Fri, 12 Jan 2024 12:10:23 +0100
+Subject: ALSA: oxygen: Fix right channel of capture volume mixer
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit a03cfad512ac24a35184d7d87ec0d5489e1cb763 upstream.
+
+There was a typo in oxygen mixer code that didn't update the right
+channel value properly for the capture volume.  Let's fix it.
+
+This trivial fix was originally reported on Bugzilla.
+
+Fixes: a3601560496d ("[ALSA] oxygen: add front panel controls")
+Cc: <stable@vger.kernel.org>
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=156561
+Link: https://lore.kernel.org/r/20240112111023.6208-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/oxygen/oxygen_mixer.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/pci/oxygen/oxygen_mixer.c
++++ b/sound/pci/oxygen/oxygen_mixer.c
+@@ -718,7 +718,7 @@ static int ac97_fp_rec_volume_put(struct
+       oldreg = oxygen_read_ac97(chip, 1, AC97_REC_GAIN);
+       newreg = oldreg & ~0x0707;
+       newreg = newreg | (value->value.integer.value[0] & 7);
+-      newreg = newreg | ((value->value.integer.value[0] & 7) << 8);
++      newreg = newreg | ((value->value.integer.value[1] & 7) << 8);
+       change = newreg != oldreg;
+       if (change)
+               oxygen_write_ac97(chip, 1, AC97_REC_GAIN, newreg);

diff --git a/queue-5.4/series b/queue-5.4/series
index 42e76098829df813ccf27b13ba754628ff4a017b..1e7f357c4bcea0a6a4fafb23c152bfab21573160 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -152,4 +152,5 @@ usb-chipidea-wait-controller-resume-finished-for-wakeup-irq.patch
 revert-usb-typec-class-fix-typec_altmode_put_partner-to-put-plugs.patch
 usb-typec-class-fix-typec_altmode_put_partner-to-put-plugs.patch
 usb-mon-fix-atomicity-violation-in-mon_bin_vma_fault.patch
+alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch
 net-ethernet-mtk_eth_soc-remove-duplicate-if-statements.patch