From patchwork Mon Jan 8 12:35:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 123698 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2668435qgn; Mon, 8 Jan 2018 04:35:35 -0800 (PST) X-Google-Smtp-Source: ACJfBotI+c4N9fevXyMVPqUuuREJqOmLxZzanmiy5g9TTYA+Iajn5y9QHfWP0RzspMVNIagC9KsR X-Received: by 10.223.142.200 with SMTP id q66mr1299190wrb.267.1515414935455; Mon, 08 Jan 2018 04:35:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515414935; cv=none; d=google.com; s=arc-20160816; b=GycRnx7KIp0Djv0Vt4C1RYjvG0af0RAKZO2NYQU4VA60utl9us7KY4w0L6YLJBdH1i //hUie3UStuqO4BSqaODaUdaNdCs4XA1RQpKw3IeMeuWNXTeSSwJB/BXGylivWuXmMU1 dpOPY/+GBeAlrNu4piprJ2bMajwnr0/6ZIuIa5wbFEUAYoCP2hwhlxchrjPaaSpuCcuu dIdxUoWTxVQYGh9i7FveDiSdXlKiHR/Nnyenkl6wiobsIz1TVbFCM2y5UohRrStk23K8 PeVCGqp88PPe6Ny98ptgcDY/KGnfBgmkkCpsf9e5VJINsH+lbENDDwtTblx5zEdn2IQ8 Vr+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:mime-version:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:cc:date :message-id:in-reply-to:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=SEGdhz/mRaV4vtsm6LM502Zcy3Zpxr7M8PNRptiioNM=; b=VKNCd1YQzO2gh9eBvrqzn+aiD90dvB4A+0uYKfVxPGSVVX3EkpqtBckoDgO5KBxUZM J84WDJhZbooubRrOAyc/2Pnbnhy0W4WT+7Hwl2gKE3FovYaDACMNGfBo52Jahm/UkrBd 3zj/vMnNwhHQJy5RLWso6wYH4LbfRh5WFgzrhR7hU/LV9VUmiPTle9svQbk/SyqRo8TR N8yk5+7Rx2a2PP74KJqTqfpQjnoGF+nO4pIEAkxa+FRRaMhiMLrFRTpTUaQSsSJ5SnzR YZP4lYCMavClj8cRMFGc4w3YPlcnjObHSeCG7EE7RzjNNLFbGW5+Kf82FY6GSmHy2mpf 8xBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=j4/+E7+T; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id r10si9097456wrg.184.2018.01.08.04.35.35; Mon, 08 Jan 2018 04:35:35 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=j4/+E7+T; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 30CDC266D86; Mon, 8 Jan 2018 13:35:34 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id CFC3A266E4B; Mon, 8 Jan 2018 13:35:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 25CDF26698E for ; Mon, 8 Jan 2018 13:35:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=c+mqMaOgLz7DSbu5XWZz0hQUuHehR82T4Md9fSahDU4=; b=j4/+E7+T+DVz EG4qI/Ix5iXqGj8NRCX2tAv8T5EI1Xs9kTSUxDMN0FM1SOjicMErqugids4vLAT6MvGVvhERR4iww 5k58IHqwjpBgOW/gp2b4X+LuK8P+Ua7Jt3ifOTfgFCnfg+VcTb06QGGbGI+zKwB8H86XDJX3to7TZ P0fr0=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eYWe4-0001xF-J4; Mon, 08 Jan 2018 12:35:16 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1eYWe3-0003Fq-Ih; Mon, 08 Jan 2018 12:35:15 +0000 From: Mark Brown To: Pierre-Louis Bossart In-Reply-To: <20180105205536.10366-2-pierre-louis.bossart@linux.intel.com> Message-Id: Date: Mon, 08 Jan 2018 12:35:15 +0000 Cc: jeremy@jcline.org, alsa-devel@alsa-project.org, andriy.shevchenko@linux.intel.com, tiwai@suse.de, stable@vger.kernel.org, liam.r.girdwood@linux.intel.com, Nicole F??rber , broonie@kernel.org, vinod.koul@intel.com Subject: [alsa-devel] Applied "ASoC: acpi: fix machine driver selection based on quirk" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: acpi: fix machine driver selection based on quirk has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 5c256045b87b8aa8e5bc9d2e2fdc0802351c1f99 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Fri, 5 Jan 2018 14:55:33 -0600 Subject: [PATCH] ASoC: acpi: fix machine driver selection based on quirk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ACPI/machine-driver code refactoring introduced in 4.13 introduced a regression for cases where we need a DMI-based quirk to select the machine driver (the BIOS reports an invalid HID). The fix is just to make sure the results of the quirk are actually used. Fixes: 54746dabf770 ('ASoC: Improve machine driver selection based on quirk data') Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=96691 Tested-by: Nicole Færber Signed-off-by: Pierre-Louis Bossart Signed-off-by: Mark Brown Cc: stable@vger.kernel.org --- sound/soc/soc-acpi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.15.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-acpi.c b/sound/soc/soc-acpi.c index f21df28bc28e..d4dd2efea45e 100644 --- a/sound/soc/soc-acpi.c +++ b/sound/soc/soc-acpi.c @@ -84,11 +84,9 @@ snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines) for (mach = machines; mach->id[0]; mach++) { if (snd_soc_acpi_check_hid(mach->id) == true) { - if (mach->machine_quirk == NULL) - return mach; - - if (mach->machine_quirk(mach) != NULL) - return mach; + if (mach->machine_quirk) + mach = mach->machine_quirk(mach); + return mach; } } return NULL;