This is a note to let you know that I've just added the patch titled
ALSA: oxygen: Fix right channel of capture volume mixer
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a03cfad512ac24a35184d7d87ec0d5489e1cb763 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri, 12 Jan 2024 12:10:23 +0100
Subject: ALSA: oxygen: Fix right channel of capture volume mixer
From: Takashi Iwai <tiwai@xxxxxxx>
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@xxxxxxxxxxxxxxx>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=156561
Link: https://lore.kernel.org/r/20240112111023.6208-1-tiwai@xxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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);
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-5.15/alsa-hda-fix-speaker-and-headset-mic-pin-config-for-.patch
queue-5.15/alsa-scarlett2-add-missing-error-checks-to-_ctl_get.patch
queue-5.15/alsa-scarlett2-add-clamp-in-scarlett2_mixer_ctl_put.patch
queue-5.15/alsa-scarlett2-add-missing-error-check-to-scarlett2_.patch
queue-5.15/alsa-hda-relatek-enable-mute-led-on-hp-laptop-15s-fq2xxx.patch
queue-5.15/alsa-scarlett2-add-missing-error-check-to-scarlett2_.patch-9803
queue-5.15/alsa-scarlett2-allow-passing-any-output-to-line_out_.patch
queue-5.15/alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch
