--- sound/pci/hda/patch_sigmatel.c

+++ sound/pci/hda/patch_sigmatel.c

@@ -727,7 +727,7 @@ static int stac92xx_mux_enum_put(struct

struct sigmatel_spec *spec = codec->spec;

unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);

const struct hda_input_mux *imux = spec->input_mux;

- unsigned int idx, prev_idx, didx;

+ unsigned int idx, prev_idx;

idx = ucontrol->value.enumerated.item[0];

if (idx >= imux->num_items)

@@ -739,8 +739,7 @@ static int stac92xx_mux_enum_put(struct

snd_hda_codec_write_cache(codec, spec->mux_nids[adc_idx], 0,

AC_VERB_SET_CONNECT_SEL,

imux->items[idx].index);

- if (prev_idx >= spec->num_analog_muxes &&

- spec->mux_nids[adc_idx] != spec->dmux_nids[adc_idx]) {

+ if (prev_idx >= spec->num_analog_muxes) {

imux = spec->dinput_mux;

/* 0 = analog */

snd_hda_codec_write_cache(codec,

@@ -750,13 +749,9 @@ static int stac92xx_mux_enum_put(struct

}

} else {

imux = spec->dinput_mux;

- /* first dimux item is hardcoded to select analog imux,

- * so lets skip it

- */

- didx = idx - spec->num_analog_muxes + 1;

snd_hda_codec_write_cache(codec, spec->dmux_nids[adc_idx], 0,

AC_VERB_SET_CONNECT_SEL,

- imux->items[didx].index);

+ imux->items[idx - 1].index);

}

spec->cur_mux[adc_idx] = idx;

return 1;