[alsa-devel] [PATCH - hda / AD1988 ; 1/1] Compare pin type enum to the pin type and not the array index

[Takashi Iwai]

At Thu, 19 May 2011 22:20:10 +0100,
Adrian wrote:
> 
> Fixes bug#0005368
> [2 0001-Compare-pin-type-enum-to-the-pin-type-and-not-the-ar.patch <text/x-patch; US-ASCII (base64)>]
> From 967c641faa4ad2f50c7882f29bdbefbee08d1ac2 Mon Sep 17 00:00:00 2001
> From: Adrian Wilkins <adrian.wilkins at nhs.net>
> Date: Thu, 19 May 2011 21:52:38 +0100
> Subject: [PATCH - hda / AD1988 ;  1/1] Compare pin type enum to the pin type and not the array index
> 
> 
> Signed-off-by: Adrian Wilkins <adrian.wilkins at nhs.net>

Thanks, applied now.


Takashi

> diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
> index 734c6ee..dbf40b7 100644
> --- a/sound/pci/hda/patch_analog.c
> +++ b/sound/pci/hda/patch_analog.c
> @@ -3070,6 +3070,7 @@ static void ad1988_auto_init_analog_input(struct hda_codec *codec)
>  
>  	for (i = 0; i < cfg->num_inputs; i++) {
>  		hda_nid_t nid = cfg->inputs[i].pin;
> +		int type = cfg->inputs[i].type;
>  		switch (nid) {
>  		case 0x15: /* port-C */
>  			snd_hda_codec_write(codec, 0x33, 0, AC_VERB_SET_CONNECT_SEL, 0x0);
> @@ -3079,7 +3080,7 @@ static void ad1988_auto_init_analog_input(struct hda_codec *codec)
>  			break;
>  		}
>  		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
> -				    i == AUTO_PIN_MIC ? PIN_VREF80 : PIN_IN);
> +				    type == AUTO_PIN_MIC ? PIN_VREF80 : PIN_IN);
>  		if (nid != AD1988_PIN_CD_NID)
>  			snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
>  					    AMP_OUT_MUTE);
> -- 
> 1.7.4.1
>