From patchwork Wed Mar 7 14:22:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130913 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5242248lja; Wed, 7 Mar 2018 06:23:02 -0800 (PST) X-Google-Smtp-Source: AG47ELs/MHqfYtE8VaSerzHwUiS0ZLhYQHdG4BFDpvNwmpDvA2+bRUw1nVooZ31GTGVCj5jdArXR X-Received: by 10.28.65.213 with SMTP id o204mr15832554wma.97.1520432582896; Wed, 07 Mar 2018 06:23:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520432582; cv=none; d=google.com; s=arc-20160816; b=NDqSLdWadOk31aRP/K9dcoO909v12tQr2JwpozOjRRE0SzZTzPdD2mIn2qB3rWAxzr bRfjNRTfUutqZSUpg7O/aKaYp/w9iT0dJ2JBQnxod8AcllmybzfaXIJlx4jEOycmult6 KNYiptxcJUcXwcC0ia4DHSJyXGW1XNUByV+WnR7/nXXsP2ihkgZQgqVTZGiWRUBcRw0B SUovsu2nf1eDUfFsSRNMy3CuHYpsvW73Ovw6D4HJdwIPjs2tFShfsI+QF6xeC9chRkj3 ZKIZyBpygvfOT5pEQBS6p1Dv2glOWxRwZfW45AYLATO7gipnQ1FKS5kxndjRs42EBYV9 zlzg== 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=9fajKbDomaPMPJqHP53xtZ2w85gwXrXcdNrWTimk+ZU=; b=GNEJCFBPhv/ugD2LC2U3ka3Uj6kXWBDkbrpeqPi1xrnqOGiHZ0wom1/D6KM0yrNhU3 yXZHo5RyFYbx+Y7JZSvp0hCGBgehZghcJsSYPKOYiRORuLfLJc6LTQ65e+30XbcWq8mq u6fU3t/eUqvJbgEGOVIJTqd6xsJD8Lyo8PtVTOe6f35t3Pyz/A6o+UdTD38hjTDuspmt 0mrmeM+Lw+SYo+U/JBwaZcUDnDPCgnXk7OvnSPqeno/nG/RsyBxSWmPPJSfKewl0I6yY lpzq0UPizXe72cm9BZKXV/b9TuX8EDrlDI3Vy827nHtQJdN41scx0lonhlB5VJSAhlBv vtVQ== 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=ROzTsD7L; 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 y39si3201322wrd.117.2018.03.07.06.23.02; Wed, 07 Mar 2018 06:23:02 -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=ROzTsD7L; 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 3C2E5267439; Wed, 7 Mar 2018 15:22:47 +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 B48362673F6; Wed, 7 Mar 2018 15:22:44 +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 E3098267339 for ; Wed, 7 Mar 2018 15:22:38 +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=+5cr8U5O3wKKe3HQHTEtzfVwna9fLFngXN1oB4cqQUk=; b=ROzTsD7LHRYI 5UlF/i1vty00PXZCmkviGBD62W9X5g/42wpRmL9eTr6cBqUoKY/cjSAKY71gjJhOGYRfvkhqof5gv H6avCbi42itNqYCNuBc69kpE/rx38uVobv8yUHdweSdgEoeOeuuwp7k43Jd8M35Z+DckUHbtBD9Gu Y4LDA=; 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 1etZxi-0000EB-1Y; Wed, 07 Mar 2018 14:22:34 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1etZxh-0002pk-Iz; Wed, 07 Mar 2018 14:22:33 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: <20180304143610.21125-14-hdegoede@redhat.com> Message-Id: Date: Wed, 07 Mar 2018 14:22:33 +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: Only create jack if we have a jack-detect source" 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: Only create jack if we have a jack-detect source 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 aed859a2c7ac8c44ba9b3a6f82b5f08da8a0a975 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 4 Mar 2018 15:36:01 +0100 Subject: [PATCH] ASoC: Intel: bytcr_rt5651: Only create jack if we have a jack-detect source Only create the jack if we have a valid jack-detect source and properly check the snd_soc_component_set_jack() return value. Tested-by: Carlo Caione Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 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 a874bba3aec0..56f1f076d92c 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -404,17 +404,21 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) dev_err(card->dev, "unable to set MCLK rate\n"); } - ret = snd_soc_card_jack_new(runtime->card, "Headset", + if (BYT_RT5651_JDSRC(byt_rt5651_quirk)) { + ret = snd_soc_card_jack_new(runtime->card, "Headset", SND_JACK_HEADSET, &priv->jack, bytcr_jack_pins, ARRAY_SIZE(bytcr_jack_pins)); - if (ret) { - dev_err(runtime->dev, "Headset jack creation failed %d\n", ret); - return ret; - } + if (ret) { + dev_err(runtime->dev, "jack creation failed %d\n", ret); + return ret; + } - snd_soc_component_set_jack(codec, &priv->jack, NULL); + ret = snd_soc_component_set_jack(codec, &priv->jack, NULL); + if (ret) + return ret; + } - return ret; + return 0; } static const struct snd_soc_pcm_stream byt_rt5651_dai_params = {