1 files changed, 67 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.6/0062-ALSA-oxygen-virtuoso-fix-exchanged-L-R-volumes-of-au.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.6/0062-ALSA-oxygen-virtuoso-fix-exchanged-L-R-volumes-of-au.patch
new file mode 100644
index 00000000..4bd7da23
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.6/0062-ALSA-oxygen-virtuoso-fix-exchanged-L-R-volumes-of-au.patch
@@ -0,0 +1,67 @@
+From bc7e7c8b2462ed098d18bc54b431341cc69584b2 Mon Sep 17 00:00:00 2001
+From: Clemens Ladisch <clemens@ladisch.de>
+Date: Sat, 4 Feb 2012 20:56:47 +0100
+Subject: [PATCH 62/87] ALSA: oxygen, virtuoso: fix exchanged L/R volumes of
+ aux and CD inputs
+
+commit 2492250e4412c6411324c14ab289629360640b0a upstream.
+
+The driver accidentally exchanged the left/right fields for stereo AC'97
+mixer registers.  This affected only the aux and CD inputs because the
+line input bypasses the AC'97 codec and the mic input is mono; cards
+without AC'97 (Xonar DS/DG/HDAV Slim, HG2PCI, HiFier) were not affected.
+
+Reported-and-tested-by: Abby Cedar <abbycedar@yahoo.com.au>
+Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/oxygen/oxygen_mixer.c |   25 ++++++++++++++-----------
+ 1 files changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
+index 26c7e8b..c0dbb52 100644
+--- a/sound/pci/oxygen/oxygen_mixer.c
++++ b/sound/pci/oxygen/oxygen_mixer.c
+@@ -618,9 +618,12 @@ static int ac97_volume_get(struct snd_kcontrol *ctl,
+        mutex_lock(&chip->mutex);
+        reg = oxygen_read_ac97(chip, codec, index);
+        mutex_unlock(&chip->mutex);
+-       value->value.integer.value[0] = 31 - (reg & 0x1f);
+-       if (stereo)
+-               value->value.integer.value[1] = 31 - ((reg >> 8) & 0x1f);
++       if (!stereo) {
++               value->value.integer.value[0] = 31 - (reg & 0x1f);
++       } else {
++               value->value.integer.value[0] = 31 - ((reg >> 8) & 0x1f);
++               value->value.integer.value[1] = 31 - (reg & 0x1f);
++       }
+        return 0;
+ }
+ 
+@@ -636,14 +639,14 @@ static int ac97_volume_put(struct snd_kcontrol *ctl,
+ 
+        mutex_lock(&chip->mutex);
+        oldreg = oxygen_read_ac97(chip, codec, index);
+-       newreg = oldreg;
+-       newreg = (newreg & ~0x1f) |
+-               (31 - (value->value.integer.value[0] & 0x1f));
+-       if (stereo)
+-               newreg = (newreg & ~0x1f00) |
+-                       ((31 - (value->value.integer.value[1] & 0x1f)) << 8);
+-       else
+-               newreg = (newreg & ~0x1f00) | ((newreg & 0x1f) << 8);
++       if (!stereo) {
++               newreg = oldreg & ~0x1f;
++               newreg |= 31 - (value->value.integer.value[0] & 0x1f);
++       } else {
++               newreg = oldreg & ~0x1f1f;
++               newreg |= (31 - (value->value.integer.value[0] & 0x1f)) << 8;
++               newreg |= 31 - (value->value.integer.value[1] & 0x1f);
++       }
+        change = newreg != oldreg;
+        if (change)
+                oxygen_write_ac97(chip, codec, index, newreg);
+-- 
+1.7.7.4
+