From patchwork Fri May 19 17:04:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 100202 Delivered-To: patch@linaro.org Received: by 10.182.142.97 with SMTP id rv1csp383194obb; Fri, 19 May 2017 10:06:06 -0700 (PDT) X-Received: by 10.28.57.9 with SMTP id g9mr6347942wma.120.1495213566544; Fri, 19 May 2017 10:06:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495213566; cv=none; d=google.com; s=arc-20160816; b=U4hjYZL+E8jX/+q0FYZlwx8r8Q5g6JOaCZSDmYMVSNFv9xbp5Sdui20ihnjrmaOSvK 6C2h3ajFZtMmm3Tvv8gd27xTaJ/6ayU+WseIzjw7NuRKr3Zyc5TeYhNG2vAQcvUWthRb vuGchFPIhTWfwFibOdbD7nX9UOjElqNvlWUnbT28lXh/wVkctm8en0urEp0RTcKWe+71 xWn0i0tabR/81Th2T3SRJkh7kluai8C/eve5JK22vQ3hAjHfG55/mXiWWHwsFjL3C6Ou BbColB3TOHN5UbsLXo1qvydPZtM/xnMWci4JDGUdd1E9cCFFO/WwtsE6ND8iku7YhONS Kpig== 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=v4x3eH+99/R4zL9/N2Wc3p1AtwacXhRM0V6BPj5pqlo=; b=OxLYm3v5pUT5N2Rp/LkX3pvrJjsL5u+0NOOMnZkTwXQ2fB3Fvn9pd7GVTY6SUVskR5 NU2LHKafx40oXwauje9GkDgRn6aiy4AYsQltrh1SGtCkC4PZrUcRjoPk0vTSihLqk+Wr jYgtSMn3735qOkJv7WoIkB+BIeTYBqSs0UAwvnbCa+g0aFHDrWqM6MCF9o55DkZelqb9 0GfsV/SsNc7N6PuFls5QIGpfS98t2sJ0PZp8MjRISd8WVoY8p5V9o8pAwSEyx+V1Anwg P61WiT9olnLondF1O0KUP0FrWBAyS5tUrtDBWr3Es7SZMVjbDUsz/U+AvDyv9RQNl+P8 r5Wg== 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 z200si28208742wmd.14.2017.05.19.10.06.06; Fri, 19 May 2017 10:06:06 -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 D5D8326723F; Fri, 19 May 2017 19:04:50 +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 101A1266C44; Fri, 19 May 2017 19:04:48 +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, 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 30D41266C4D for ; Fri, 19 May 2017 19:04:25 +0200 (CEST) Received: from [2001:470:1f1d:6b5::3] (helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dBlK2-0000UH-EI; Fri, 19 May 2017 17:04:16 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dBlJy-0003hl-AH; Fri, 19 May 2017 18:04:10 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87o9up3bwn.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Fri, 19 May 2017 18:04:10 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: Linux-Renesas , Simon , alsa-devel@alsa-project.org, Mark Brown , Dan Carpenter Subject: [alsa-devel] Applied "ASoC: audio-graph-card: tidyup return method from 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: audio-graph-card: tidyup return method from 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 ecea931350cedae8ee24abe6a65619f46a3a9c14 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 19 May 2017 00:58:00 +0000 Subject: [PATCH] ASoC: audio-graph-card: tidyup return method from probe() Current return method from probe() is very confusable. This patch tidyup it to normal return method Reported-by: Dan Carpenter Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/generic/audio-graph-card.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.11.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 07e010d38596..f41b0393ffca 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -271,8 +271,10 @@ static int asoc_graph_card_probe(struct platform_device *pdev) snd_soc_card_set_drvdata(card, priv); ret = devm_snd_soc_register_card(dev, card); - if (ret >= 0) - return ret; + if (ret < 0) + goto err; + + return 0; err: asoc_simple_card_clean_reference(card);