From: Takashi Iwai Subject: Re: [PATCH] ALSA: hda - Fix calling cs_automic twice for Cirrus codecs. Date: Wed, 01 Feb 2012 09:45:32 +0100 Message-ID: References: <1328043881-14910-1-git-send-email-dgreid@chromium.org> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id AFFD310398E for ; Wed, 1 Feb 2012 09:45:35 +0100 (CET) In-Reply-To: <1328043881-14910-1-git-send-email-dgreid@chromium.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Dylan Reid Cc: alsa-devel@alsa-project.org, tim.howe@cirrus.com List-Id: alsa-devel@alsa-project.org At Tue, 31 Jan 2012 13:04:41 -0800, Dylan Reid wrote: > > 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 Thanks, applied now. Takashi > --- > 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 0e99357..bc5a993 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; > } > -- > 1.7.9.rc0 >