From: Greg Kroah-Hartman Date: Mon, 22 Jan 2024 19:16:45 +0000 (-0800) Subject: 4.19-stable patches X-Git-Tag: v4.19.306~69 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a6ff4eec9db76c5f575bd2881583a210a3254fd;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch --- diff --git a/queue-4.19/alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch b/queue-4.19/alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch new file mode 100644 index 00000000000..373eeb0f443 --- /dev/null +++ b/queue-4.19/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 +Date: Fri, 12 Jan 2024 12:10:23 +0100 +Subject: ALSA: oxygen: Fix right channel of capture volume mixer + +From: Takashi Iwai + +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: +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 +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -730,7 +730,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-4.19/series b/queue-4.19/series index 53e30411784..3f4e228468d 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -124,3 +124,4 @@ 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