From patchwork Wed Mar 7 14:13:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130895 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5231984lja; Wed, 7 Mar 2018 06:13:53 -0800 (PST) X-Google-Smtp-Source: AG47ELvhnhwviLaHjHo2sztoNvsmWYGxbWkrpgD6zg8nL/US+Q3+D3zSiG7eG+9zzlMMzZWhpVq9 X-Received: by 10.223.175.235 with SMTP id y43mr18658044wrd.41.1520432033832; Wed, 07 Mar 2018 06:13:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520432033; cv=none; d=google.com; s=arc-20160816; b=tmvpr+v8hpW9g+NkaVLFi2vknGpq9yKVSbhPh/RWNzcokv829tkuWsqmnk7ajy1lZ9 G+bVc7QLyToqRGuKLKphQjRiw5o32jpEHHHV/TT9xDOVEN+LUv2SS+RXdmMllFkrk0V/ Tjqad32iQ1JsTwl6W9eZxzfLmXZHy3WSZ+dadLDm/uivdihR4UZbeCNDWC/HUt41l+8y 0UiINimofjBjfeIoADqH1CnC22SDhLFWwOn6T81He4nbJQ5LT+1vaWizim0ARo3nln6a flYa+sEqQFgXyPJ9/vUuLio+54/mZGtkONA2phRvOp8J8muYvCG/i2ZCQ7UPQobyvttd oasA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=n4juigVQLLeJkrlN/x7e9Rn8JDWA/drZtlBixA0UIH8=; b=iXOeWdU40XCRUzVHAJSx7a2BSBnNCfxxskHoMSNBemXeSQSjxj9vHUunjO8fan1Hsm B63y7l//f6+LncaBkH70zb8lNduL1tLn+SXlLrO/xVh3ao0zgB6mb0f2MJzEvrgjEGP9 Un4qucSckYP+CctgoVsLwREDHvNddSvmLC5YEQz84xoy1sFGXVZqZI6N7nKCmmOzX1xz FOOguuA4MA9g+oLYcR3yHv7jUxfTODZhMYTqUGzv1UPB/sRFrwuOuqHUWeKtb6fVyJla 35DrU+UsnCzj6QAg0FQUI7nMcU1eHnpxg07zjxcr+wfyYFH/kXph16W47cgzfUrJ4Y7X t2IA== 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=tx03mNgI; 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 o98si4442519wrc.148.2018.03.07.06.13.53; Wed, 07 Mar 2018 06:13:53 -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=tx03mNgI; 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 F096D267255; Wed, 7 Mar 2018 15:13:51 +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 B5B18267371; Wed, 7 Mar 2018 15:13:49 +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 97B25267048 for ; Wed, 7 Mar 2018 15:13:46 +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=KzXQcp4IthP5XktbwpvxjY+7FxQ13mCzZ6WOZ5lpM/s=; b=tx03mNgI1sQ4 /EtRQdV9PpFXDd0oowf3RuNPIVYAL/oc4jPgWBSdekCwdNiYqFjp9C9/qXdvDqNZbhQhJW7t+NHd5 C3wUnRsYAusJ+SR3R3wrY8t5qMn34lxnQvor8GGmQ9SqoxgcvrZ0QRVFMNSt9IOhDio79t4yLGyqn nDgSA=; 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 1etZp1-0000A8-Qy; Wed, 07 Mar 2018 14:13:35 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1etZp1-0001L8-Cf; Wed, 07 Mar 2018 14:13:35 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: <20180304143610.21125-11-hdegoede@redhat.com> Message-Id: Date: Wed, 07 Mar 2018 14:13:35 +0000 Cc: Oder Chiou , alsa-devel@alsa-project.org, Pierre-Louis Bossart , Takashi Iwai , Mark Brown , Carlo Caione , Bard Liao Subject: [alsa-devel] Applied "ASoC: Intel: bytcr_rt5651: Not being able to find the codec ACPI-dev is an error" 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: Intel: bytcr_rt5651: Not being able to find the codec ACPI-dev is an error 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 e39cacc1b7de2a6d72ce49043c9cfd7dd129135a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 4 Mar 2018 15:35:58 +0100 Subject: [PATCH] ASoC: Intel: bytcr_rt5651: Not being able to find the codec ACPI-dev is an error If we cannot find the codec ACPI-dev, then the snd-soc-core will not be able to find the codec either and snd_soc_register_card() will just keep exiting with -EPROBE_DEFER, filling the log with errors each time the probe gets retried. Instead simply log an error from the machine driver and exit with -ENODEV. Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) -- 2.16.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 456526a93dd5..105339c5b693 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -540,12 +540,13 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) /* fixup codec name based on HID */ i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1); - if (i2c_name) { - snprintf(byt_rt5651_codec_name, sizeof(byt_rt5651_codec_name), - "%s%s", "i2c-", i2c_name); - - byt_rt5651_dais[dai_index].codec_name = byt_rt5651_codec_name; + if (!i2c_name) { + dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id); + return -ENODEV; } + snprintf(byt_rt5651_codec_name, sizeof(byt_rt5651_codec_name), + "%s%s", "i2c-", i2c_name); + byt_rt5651_dais[dai_index].codec_name = byt_rt5651_codec_name; /* check quirks before creating card */ dmi_check_system(byt_rt5651_quirk_table);