Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp2925297iog; Mon, 27 Jun 2022 05:55:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1scVi1v087mCo8PeGEacGbCANc5W/DG8n1BHUTlNQrmPqIyXsfmm9IndjENH82DIyPuJV88 X-Received: by 2002:a17:902:c101:b0:16a:1272:270e with SMTP id 1-20020a170902c10100b0016a1272270emr14273046pli.163.1656334502113; Mon, 27 Jun 2022 05:55:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656334502; cv=none; d=google.com; s=arc-20160816; b=BL+DwJgvQMWWB8BPeaGeJbuQvl5WdnIU1+Hn6mqolz4wbp9dRx/pWg9/qIxCaiRsZ4 NOIXO89D6+xCyBNicE9KGcn5nuCVvdBdd26pUd5zZvVOVqe1uP92E8yI2LWNmlK7t2Xw teuys8ftNxXO8M0ofE7CniWUzV/q7wwJadcDX8UQbhrwxLp9RMRwnbwOmbBhUY23k/Oc TFctASEn/8g0g7srAGPasJAsh54Hg2QcH28IyqXUTizkkTbCCAhmUJJZgqTmDZF0jOiL oNgq5ziA+zyCgmQ+dFdooh+QAm7UjwBHF6Rao1ryJqCFrkszP55gG2t9W3pqMhByTB9t t92A== 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=hwPS7bzkJtKRjJKXoOGaDVHX+nZLMVj876OpBC2aqMc=; b=aaIG5sLKGdXAwrUxAtse/DUdpFG1N+hduOK5Mcc8dljg5FKSlRcGOkEyGzjEXbYzQz oUCgsJ7qo0lgHwbTd7SfSu9uzLv5Pi//nvUdxCkAtC1+hNQx6UHB5pjPCiQlfSyjpERP QH2I1FF3O4EoVOarL6FJojSVmQcyJW1xEp6hABUx85ehSsn5g8LIZEgr3YqWuM39GLh4 LO0o7S00rkria8GsPQZaOfU7YqrxG4U+LquT5aBTWU94ggrdrtn6QhHkmrbOqaU7jBLM kMGs65v4gEumFL4Hfg/n4oWuVRFQnOT/DvZdTYXUsSE2pCT1ywdn9XCGpvQKnCpo8Mfb 2Y0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=edZSr5JY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m75-20020a633f4e000000b003ab7a1a2193si15268120pga.151.2022.06.27.05.54.50; Mon, 27 Jun 2022 05:55:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=edZSr5JY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S234829AbiF0LY5 (ORCPT + 99 others); Mon, 27 Jun 2022 07:24:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234780AbiF0LYi (ORCPT ); Mon, 27 Jun 2022 07:24:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12DB5658B; Mon, 27 Jun 2022 04:24:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A071D61458; Mon, 27 Jun 2022 11:24:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AAB10C3411D; Mon, 27 Jun 2022 11:24:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1656329077; bh=vEOyzikwHr8yUIyT1NrM8XxN7gOHcBAHFwZsTCrnaNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=edZSr5JYUekTSbL5mqLAD0ZW6n9XktTLFVaG0rMAzpBbdSYAWUZR18FGUy0lMxf18 TUuUjEHOhZk0xCSxW9bTUpWZiMPeboDkf+0MbDSohF9rglg3Naag+CEaETwaeUg57I roRLgRVDrxB1aT6R2py3d96znlw0wf9uN54Ssivk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 5.10 005/102] ALSA: hda/conexant: Fix missing beep setup Date: Mon, 27 Jun 2022 13:20:16 +0200 Message-Id: <20220627111933.621750485@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220627111933.455024953@linuxfoundation.org> References: <20220627111933.455024953@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai commit 5faa0bc69102f3a4c605581564c367be5eb94dfa upstream. Currently the Conexant codec driver sets up the beep NID after calling snd_hda_gen_parse_auto_config(). It turned out that this results in the insufficient setup for the beep control, as the generic parser handles the fake path in snd_hda_gen_parse_auto_config() only if the beep_nid is set up beforehand. For dealing with the beep widget properly, call cx_auto_parse_beep() before snd_hda_gen_parse_auto_config() call. Fixes: 51e19ca5f755 ("ALSA: hda/conexant - Clean up beep code") Cc: Link: https://bugzilla.kernel.org/show_bug.cgi?id=216152 Link: https://lore.kernel.org/r/20220620104008.1994-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/patch_conexant.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -1072,11 +1072,11 @@ static int patch_conexant_auto(struct hd if (err < 0) goto error; - err = snd_hda_gen_parse_auto_config(codec, &spec->gen.autocfg); + err = cx_auto_parse_beep(codec); if (err < 0) goto error; - err = cx_auto_parse_beep(codec); + err = snd_hda_gen_parse_auto_config(codec, &spec->gen.autocfg); if (err < 0) goto error;