diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-12 16:43:32 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-12 16:43:32 +0200 |
| commit | 8213466596bf10b75887754773ee13c10cf86f5c (patch) | |
| tree | b52ab03e9d1812ab069989a48c76636293a1387c /sound/pci/ice1712 | |
| parent | 9fe17b5d47d3d3c85b35623dea8f571a184134c0 (diff) | |
| download | linux-3.10-8213466596bf10b75887754773ee13c10cf86f5c.tar.gz linux-3.10-8213466596bf10b75887754773ee13c10cf86f5c.tar.bz2 linux-3.10-8213466596bf10b75887754773ee13c10cf86f5c.zip | |
ALSA: ice1724 - Fix ESI Maya44 capture source control
The capture source control of maya44 was wrongly coded with the bit
shift instead of the bit mask. Also, the slot for line-in was
wrongly assigned (slot 5 instead of 4).
Reported-by: Alex Chernyshoff <alexdsp@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712')
| -rw-r--r-- | sound/pci/ice1712/maya44.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ice1712/maya44.c b/sound/pci/ice1712/maya44.c index 3e1c20ae2f1..726fd4b92e1 100644 --- a/sound/pci/ice1712/maya44.c +++ b/sound/pci/ice1712/maya44.c @@ -347,7 +347,7 @@ static int maya_gpio_sw_put(struct snd_kcontrol *kcontrol, /* known working input slots (0-4) */ #define MAYA_LINE_IN 1 /* in-2 */ -#define MAYA_MIC_IN 4 /* in-5 */ +#define MAYA_MIC_IN 3 /* in-4 */ static void wm8776_select_input(struct snd_maya44 *chip, int idx, int line) { @@ -393,8 +393,8 @@ static int maya_rec_src_put(struct snd_kcontrol *kcontrol, int changed; mutex_lock(&chip->mutex); - changed = maya_set_gpio_bits(chip->ice, GPIO_MIC_RELAY, - sel ? GPIO_MIC_RELAY : 0); + changed = maya_set_gpio_bits(chip->ice, 1 << GPIO_MIC_RELAY, + sel ? (1 << GPIO_MIC_RELAY) : 0); wm8776_select_input(chip, 0, sel ? MAYA_MIC_IN : MAYA_LINE_IN); mutex_unlock(&chip->mutex); return changed; |