From patchwork Fri Jul 7 12:51:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 107193 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp26209qge; Fri, 7 Jul 2017 05:53:17 -0700 (PDT) X-Received: by 10.223.154.141 with SMTP id a13mr762204wrc.139.1499431997498; Fri, 07 Jul 2017 05:53:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499431997; cv=none; d=google.com; s=arc-20160816; b=WAyqC5G9g26cT7jRjNyBTZyWrhX4U3v+MhbKJbffMKbd5BbmN+vtsOPQsYimDICecg bdU5+JL69rBGRXkJ4v0M+ZCkIsxn1ltcpJizBMyI0iZeWMxHIm5lWcULeY5Hf2tAZxWB +xx+TgNawff1vg17QZ6vOMdbsE3tkw9JOexEh5Kk652IhPE/0F1VAKddpxqW3HPVBtgx qfSLx4hspTmFNW/B5uqsPOFYKeCCiXDAYDDZtkhHvf+DTVMBghqqTljrMN6nQqGGB8us +VKYzbPnZQ+vQU6uJWnd6LpXKRQqRgJ6wwTcQnhqQxgF7PfuBAYeOD+csAnmKW64OsUh j5hQ== 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 :delivered-to:arc-authentication-results; bh=UDd6IA4n2Xiww8dV1qUedYYBjVPvfVFW4SP19V4kuSY=; b=jSRlI1U0ZLVeItWCYI+LJ0qSlPAK2/yLVckPeBIeOMg29K3v3y+7UJB5mb6OwCp/jn +xjvs50icAW54/N7CP9atVoTuKHp/HAPk6tqBFgd4BCN06KWLa4TesAsN87LikN/7bE8 5lyj0QMEtu3Y1MFmFBEJnIq2/NIsWRUpnRydNugteUrvRPxrvHzhixBL2UAKng021ag1 mf+kzJpOsaxD+CFh/dNZV3qJPVlg43OTt5EpufgjMf/g9VEqn7DoDaBa+K3xygA2nnaX r4Wa0z+/40cvcx2ZIxEpGMjTL7BmhbEew+3LZGUE6j/K2a1dHd8N3Yhpqy7WEWP3qRNK sK3A== ARC-Authentication-Results: i=1; mx.google.com; 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 p3si2889386wmp.33.2017.07.07.05.53.17; Fri, 07 Jul 2017 05:53:17 -0700 (PDT) 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; 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 738E42671FB; Fri, 7 Jul 2017 14:52:57 +0200 (CEST) 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 7344826721F; Fri, 7 Jul 2017 14:52:54 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 92A572671F4 for ; Fri, 7 Jul 2017 14:52:36 +0200 (CEST) Received: from [2001:470:1f1d:6b5:7e7a:91ff:fede:4a45] (helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dTSje-0005XC-Ps; Fri, 07 Jul 2017 12:51:53 +0000 Received: from broonie by finisterre with local (Exim 4.89) (envelope-from ) id 1dTSjb-0002lE-CP; Fri, 07 Jul 2017 13:51:47 +0100 From: Mark Brown To: Gustavo A. R. Silva In-Reply-To: <20170630222648.GA19310@embeddedgus> Message-Id: Date: Fri, 07 Jul 2017 13:51:47 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5:7e7a:91ff:fede:4a45 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood , Mark Brown , "Gustavo A. R. Silva" Subject: [alsa-devel] Applied "ASoC: twl6040: fix error return code in twl6040_probe()" 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: twl6040: fix error return code in twl6040_probe() has been applied to the asoc tree at git://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 2a788bcd390e585cb64074497037884c7eeecb27 Mon Sep 17 00:00:00 2001 From: "Gustavo A. R. Silva" Date: Fri, 30 Jun 2017 17:26:48 -0500 Subject: [PATCH] ASoC: twl6040: fix error return code in twl6040_probe() platform_get_irq() returns an error code, but the twl6040 driver ignores it and always returns -EINVAL. This is not correct, and prevents -EPROBE_DEFER from being propagated properly. Notice that platform_get_irq() no longer returns 0 on error. Print and propagate the return value of platform_get_irq on failure. Signed-off-by: Gustavo A. R. Silva Signed-off-by: Mark Brown --- sound/soc/codecs/twl6040.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.13.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 2b6ad09e0886..96cf94a2b7a0 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -1123,8 +1123,8 @@ static int twl6040_probe(struct snd_soc_codec *codec) priv->plug_irq = platform_get_irq(pdev, 0); if (priv->plug_irq < 0) { - dev_err(codec->dev, "invalid irq\n"); - return -EINVAL; + dev_err(codec->dev, "invalid irq: %d\n", priv->plug_irq); + return priv->plug_irq; } INIT_DELAYED_WORK(&priv->hs_jack.work, twl6040_accessory_work);