Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3363353pxf; Mon, 5 Apr 2021 10:03:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/FgmaGSuq/6WGOZXG5ZuaggKFhW4uwngCtpeRcQli5S5FrMBisP7GjUklna+XedVKzkgo X-Received: by 2002:a17:906:c414:: with SMTP id u20mr28734373ejz.215.1617642231120; Mon, 05 Apr 2021 10:03:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617642231; cv=none; d=google.com; s=arc-20160816; b=hOgP9r5hS8Ld+Ilb5/VcPvdhsQmBwcFFfPRDdiyH/9ObKsa34PNTznDW4tfZIZpetN WG9+oIYFkFbUabqInLGjd20IwBbeKVbrhzL8jKmbF21dBU8AO6uQGgnZtp+ZrnRz+Yo4 mWkeB3FHQJk6krp0eIFdsy3z9MjR2yGI3qLVVtMds+U947eK8NM9n1JBGgscFUvSkLA8 /Ea0y8GtQTaGH2yYgzO5vGUVqRdkhbNPpvcklpfQ220E5HrM7isuxHKYegKAW9Op7Gus i/mWqQyhRGBku3QUsewsD+HC3+KqPsAIgoZ3nB4C0dLCKxy5o5QG0ORm3z/PsJhRtcci RIYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1TYu6WpFuadtdmgDlqxg5h9iymAKDuAy1o6hmKgZ6Po=; b=r0F3+cfRcYbwymxrrqM74mmV/3+r6FPTwBM3xWIqOdadmoHdAKmHafG+TuZnaI+w6A uWR3+LyYNH7hLrJj4oafH0htLm784KwaxK9UlLMbwiRRTFR6KD3rgfLZUp4Rmq0ZZO3c 8fNZg2C1KBn0OL6LUqAJfj8Iz7SxZNfVcMmGf8gUfnGRvPT63kv5evDGI/xBubhdbjAh kJBCzgJXZfBUBkgjyCB/MpWP55YCHzqHgf+3pAur6EmMUHZ0Ufvtr0wdHWRWV2XSGT1w I08mJaVNz23sSdQFzW/qxcDLFJxF+pLRvq0YhSgUizHEoRacTl+WQ+MVvImjTFLhdolv bAdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RLYIBsAU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q14si13760100edw.414.2021.04.05.10.03.19; Mon, 05 Apr 2021 10:03:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RLYIBsAU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239991AbhDEJSa (ORCPT + 99 others); Mon, 5 Apr 2021 05:18:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:34196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240052AbhDEJOl (ORCPT ); Mon, 5 Apr 2021 05:14:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EBCFC61002; Mon, 5 Apr 2021 09:14:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617614075; bh=JA0zKI4YJPs13xXo1mnJyhcxMAbXGWmkSMD48j0AJH8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RLYIBsAUE3p6Y+3HJubCB8E0pYkI2pyPHWZNPGdYUalKG2v6t7RE2WJqbLqZJAdVu WrfjR0K3nGY3r+ez3ZgVtCjbQjILDwKDSRy9E34WtqPMETsMSsbpSSRu5jIACBrFlx jSURpElIVVIVhVF5CMhLhO18BAYX9Jo6RUmjbOW0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hui Wang , Takashi Iwai Subject: [PATCH 5.11 075/152] ALSA: hda/realtek: call alc_update_headset_mode() in hp_automute_hook Date: Mon, 5 Apr 2021 10:53:44 +0200 Message-Id: <20210405085036.704426849@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085034.233917714@linuxfoundation.org> References: <20210405085034.233917714@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hui Wang commit e54f30befa7990b897189b44a56c1138c6bfdbb5 upstream. We found the alc_update_headset_mode() is not called on some machines when unplugging the headset, as a result, the mode of the ALC_HEADSET_MODE_UNPLUGGED can't be set, then the current_headset_type is not cleared, if users plug a differnt type of headset next time, the determine_headset_type() will not be called and the audio jack is set to the headset type of previous time. On the Dell machines which connect the dmic to the PCH, if we open the gnome-sound-setting and unplug the headset, this issue will happen. Those machines disable the auto-mute by ucm and has no internal mic in the input source, so the update_headset_mode() will not be called by cap_sync_hook or automute_hook when unplugging, and because the gnome-sound-setting is opened, the codec will not enter the runtime_suspend state, so the update_headset_mode() will not be called by alc_resume when unplugging. In this case the hp_automute_hook is called when unplugging, so add update_headset_mode() calling to this function. Cc: Signed-off-by: Hui Wang Link: https://lore.kernel.org/r/20210320091542.6748-2-hui.wang@canonical.com Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5440,6 +5440,7 @@ static void alc_update_headset_jack_cb(s struct hda_jack_callback *jack) { snd_hda_gen_hp_automute(codec, jack); + alc_update_headset_mode(codec); } static void alc_probe_headset_mode(struct hda_codec *codec)