aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_cirrus.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-07-06 12:58:59 +0200
committerTakashi Iwai <tiwai@suse.de>2009-07-06 13:02:42 +0200
commitea35929b886975a240660b3ba6c61826761731ad (patch)
tree936855cbbe35e8a9b5ce3c0ab29946ec0c291f2e /sound/pci/hda/patch_cirrus.c
parent21a4dc43acdd547335f59ad52efeef5160247736 (diff)
downloadmrst-s0i3-test-ea35929b886975a240660b3ba6c61826761731ad.tar.gz
mrst-s0i3-test-ea35929b886975a240660b3ba6c61826761731ad.tar.xz
mrst-s0i3-test-ea35929b886975a240660b3ba6c61826761731ad.zip
ALSA: hda - Force to initialize input mixer setup for CS420x
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
-rw-r--r--sound/pci/hda/patch_cirrus.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 051302e7834..8e33214abeb 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -572,12 +572,13 @@ static struct snd_kcontrol_new cs_capture_ctls[] = {
HDA_BIND_VOL("Capture Volume", 0),
};
-static int change_cur_input(struct hda_codec *codec, unsigned int idx)
+static int change_cur_input(struct hda_codec *codec, unsigned int idx,
+ int force)
{
struct cs_spec *spec = codec->spec;
struct auto_pin_cfg *cfg = &spec->autocfg;
- if (spec->cur_input == idx)
+ if (spec->cur_input == idx && !force)
return 0;
if (spec->cur_adc && spec->cur_adc != spec->adc_nid[idx]) {
/* stream is running, let's swap the current ADC */
@@ -630,7 +631,7 @@ static int cs_capture_source_put(struct snd_kcontrol *kcontrol,
if (idx >= spec->num_inputs)
return -EINVAL;
idx = spec->input_idx[idx];
- return change_cur_input(codec, idx);
+ return change_cur_input(codec, idx, 0);
}
static struct snd_kcontrol_new cs_capture_source = {
@@ -773,11 +774,11 @@ static void cs_automic(struct hda_codec *codec)
present = snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_PIN_SENSE, 0);
if (present & AC_PINSENSE_PRESENCE)
- change_cur_input(codec, spec->automic_idx);
+ change_cur_input(codec, spec->automic_idx, 0);
else {
unsigned int imic = (spec->automic_idx == AUTO_PIN_MIC) ?
AUTO_PIN_FRONT_MIC : AUTO_PIN_MIC;
- change_cur_input(codec, imic);
+ change_cur_input(codec, imic, 0);
}
}
@@ -857,6 +858,7 @@ static void init_input(struct hda_codec *codec)
AC_VERB_SET_UNSOLICITED_ENABLE,
AC_USRSP_EN | MIC_EVENT);
}
+ change_cur_input(codec, spec->cur_input, 1);
if (spec->mic_detect)
cs_automic(codec);
}