diff options
| author |   Dylan Reid <dgreid@chromium.org> | 2012-01-31 13:04:41 -0800 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2012-02-01 09:43:46 +0100 |
| commit | f70eecde3bca92630d3886496e73316ff353f185 (patch) | |
| tree | 3b2a1574c8951eba1b8ece7cb277b1db19200778 /sound | |
| parent | Merge branch 'fix/asoc' into for-linus (diff) | |
| download | linux-dev-f70eecde3bca92630d3886496e73316ff353f185.tar.xz linux-dev-f70eecde3bca92630d3886496e73316ff353f185.zip | |
ALSA: hda - Fix calling cs_automic twice for Cirrus codecs.
If cs_automic is called twice (like it is during init) while the mic
is present, it will over-write the last_input with the new one,
causing it to switch back to the automic input when the mic is
unplugged. This leaves the driver in a state (cur_input, last_input,
and automix_idx the same) where the internal mic can not be selected
until it is rebooted without the mic attached.
Check that the mic hasn't already been switched to before setting
last_input.
Signed-off-by: Dylan Reid <dgreid@chromium.org>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_cirrus.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 0e99357e822c..bc5a993d1146 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -988,8 +988,10 @@ static void cs_automic(struct hda_codec *codec) change_cur_input(codec, !spec->automic_idx, 0); } else { if (present) { - spec->last_input = spec->cur_input; - spec->cur_input = spec->automic_idx; + if (spec->cur_input != spec->automic_idx) { + spec->last_input = spec->cur_input; + spec->cur_input = spec->automic_idx; + } } else { spec->cur_input = spec->last_input; } |