Commit d0f03303 authored by Dylan Reid's avatar Dylan Reid Committed by Greg Kroah-Hartman

ALSA: hda - Fix calling cs_automic twice for Cirrus codecs.

commit f70eecde upstream.

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: default avatarDylan Reid <dgreid@chromium.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f53e64f
...@@ -976,8 +976,10 @@ static void cs_automic(struct hda_codec *codec) ...@@ -976,8 +976,10 @@ static void cs_automic(struct hda_codec *codec)
/* specific to CS421x, single ADC */ /* specific to CS421x, single ADC */
if (spec->vendor_nid == CS421X_VENDOR_NID) { if (spec->vendor_nid == CS421X_VENDOR_NID) {
if (present) { if (present) {
if (spec->cur_input != spec->automic_idx) {
spec->last_input = spec->cur_input; spec->last_input = spec->cur_input;
spec->cur_input = spec->automic_idx; spec->cur_input = spec->automic_idx;
}
} else { } else {
spec->cur_input = spec->last_input; spec->cur_input = spec->last_input;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment