Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp2908458iog; Mon, 27 Jun 2022 05:33:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sHYmvm7eqgCU+rGkQvZahePV63Fa6pTT8CnJ0NQUXzC+1bmodmjqY1CrWqBfTIe5cdU1Fy X-Received: by 2002:a17:907:7dac:b0:722:3352:ac05 with SMTP id oz44-20020a1709077dac00b007223352ac05mr12612899ejc.421.1656333196749; Mon, 27 Jun 2022 05:33:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656333196; cv=none; d=google.com; s=arc-20160816; b=S4UFCn83uknSXifSQ1sgid+H+zNazd17ca7dPlaL3oEsCtoq/F3rmQ1gIUruVyA2qE ymPAZhngUYfAjJJ3w+aXtzZ+iyfA24Ec5FnU3VqLVGXVNmEZSiNd6PbyUu3/wsIwyxki 3UQvi/HNGVBLUXkt2CH/U+FkSc00r0toknTyuzf8eonweYWznSAax6ABk3zbS9YXaf4J WnDRWYHZ8nWnxC/r70TOz68ueLSpI3uiDSf9G4HWaaQZd1toRHsUZ1dOwep5jHj8wSSq DarxW0KS/y2dFplJ6Tga3UXXecltC3GgMMgOP+rc462fzbM1OIQa+su84YRTiVUq+vVU AUeQ== 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=gBC6LNWMBaJiAiAKATHHuliDSQPutWWwUgo++LO3yWs=; b=v2D9ldUV1doAZO8eR0TFdn1Hg+FQx9dwtd/mKHokSaxiiqrgNDrjpfbX9+R5Lnm9ZT KWnz2G4Gtd9RSN19JXjupj8/xvwjKyf4o2DDvY5jsTQz+oJRC2YqBElPftofPNO9TFuj 9rxj1jSce7J24rfZWZEttQvBSO91ewI/XsGl/gTZlE4+WEGN9EVYN55Vn63+ZCIHd6N9 42KvmKElf9yVYQCLn2rUULxM1dJZKkt1siY80x8v83YdFpgF7T/b/j1dtSpvSbSzP57w b625RUktRseVqPHxZSkpuM2tG0JkfHJrO7B95hNsSM5lRJb840U7O8mfyP2heQ4crmzW K4Iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kh7uNDLV; 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 g22-20020a1709065d1600b00726be93113esi951782ejt.707.2022.06.27.05.32.51; Mon, 27 Jun 2022 05:33:16 -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=kh7uNDLV; 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 S238076AbiF0LuJ (ORCPT + 99 others); Mon, 27 Jun 2022 07:50:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238138AbiF0Lrv (ORCPT ); Mon, 27 Jun 2022 07:47:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F457EE01; Mon, 27 Jun 2022 04:39:43 -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 ams.source.kernel.org (Postfix) with ESMTPS id 0B942B81123; Mon, 27 Jun 2022 11:39:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AD63C3411D; Mon, 27 Jun 2022 11:39:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1656329980; bh=O+K58Y8XS0NwtGq2lbcrHbcvtEFN2KTPEyGnAd9qpdY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kh7uNDLVbeabGruxxBEM0M1PfX9PJHBWRZrf8C3z41MNcfJyxuvR9nGBQhzIkAbOy 5aWGa6IzMGQkQ+hOap1AB3agU2pihkaqmjiooKmOK8ANCvUETz+1mw3xokAWiId8TN rzmKbrSt+qgqydox/7a+FtRd76ONf/jTS9EAoAqo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 5.18 006/181] ALSA: hda/conexant: Fix missing beep setup Date: Mon, 27 Jun 2022 13:19:39 +0200 Message-Id: <20220627111944.744507746@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220627111944.553492442@linuxfoundation.org> References: <20220627111944.553492442@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 @@ -1079,11 +1079,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;