Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82134665 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarAlex Chernyshoff <alexdsp@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9fe17b5d

sound/pci/ice1712/maya44.c

+3 −3
Original line number Diff line number Diff line
@@ -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;