From patchwork Mon May 29 14:02:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 104349 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp353808qge; Mon, 29 May 2017 07:02:59 -0700 (PDT) X-Received: by 10.28.103.214 with SMTP id b205mr22708351wmc.122.1496066579830; Mon, 29 May 2017 07:02:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496066579; cv=none; d=google.com; s=arc-20160816; b=pB72qJBsBMbG1o4QtlKdV5mdSPleYxTQODy5xMcZJu3PTQ6t9qSocLqhhydtIqgDPv BRPS2klvSXnSQYxnVqvMlc6Dg9APJ9w0q84LCtsAAnAmDZRnz+qGmC31SWpmuXyjYwhM vk8ajL7KAXY3xZZ1CmZ2NsM5nPd/+Bm4yOGQB2ovLP5kZY0dyf0C6FH6YEyx0D5ugCcW 5PWM+OD//ReJkf6LCzzm8VHePKlpcYCPb6gUyZUlX9tKJ4n6aOQt5I1sjDC37t/lDlf8 cWrGfCpr61NhjwWl3gMkJW/+mmeo+W3g1sFcbqurLx3KDzR3JN1fJ/0W09rEq4Ij2z75 re9A== 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=MI6VOazo6CccaHUQ2d+GMyIbDsOVwsnErK3agTmxPkk=; b=Z0XFq4CW4TT3wBZJ765lJjEgg1xVrjmby+yKdDLR6S4GgPqvSlvL+/tiw+hXKRgijk c0yPomrOhlg0APQovUTQv0uWwvDrtbr91lC6gd5wfWmM5bRKbXfeERVSVuET6+WVgnNh T9SPZP5MO6k8TV0Zj3fn+2jnwItrc2AASqUBYvfLXEB0a5988an2qp8BMqjVpzp5sohI JcgWjCH83T7sVQiwI/n5ZDjqsz3vK7tLgSNFty/yI/auOJlRu4MUQv3eDdNVWhRi1q/5 q+m5fOkgYad8CNXrn1iPUR4RPvGZ4lpDveMHrwzmPY005jeAdqgaYIww0aVKo73xHRFc jgmQ== 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 y1si10518292wra.133.2017.05.29.07.02.59; Mon, 29 May 2017 07:02:59 -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 47C4B266DB3; Mon, 29 May 2017 16:02:58 +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 B7EC9266DB3; Mon, 29 May 2017 16:02:56 +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 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 60A8A266DB0 for ; Mon, 29 May 2017 16:02:48 +0200 (CEST) Received: from cl-2057.lon-02.gb.sixxs.net ([2a01:348:6:808::2] helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dFLFs-0007eQ-6r; Mon, 29 May 2017 14:02:46 +0000 Received: from broonie by finisterre with local (Exim 4.89) (envelope-from ) id 1dFLFn-0001N0-9m; Mon, 29 May 2017 15:02:39 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87mva93bw4.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 29 May 2017 15:02:39 +0100 X-SA-Exim-Connect-IP: 2a01:348:6:808::2 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-scu-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-scu-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 1a2af56431781e7d6db746a1b7ae796443028dfa Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 19 May 2017 00:58:19 +0000 Subject: [PATCH] ASoC: audio-graph-scu-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-scu-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-scu-card.c b/sound/soc/generic/audio-graph-scu-card.c index 64e8b9728580..c5c52d1f500c 100644 --- a/sound/soc/generic/audio-graph-scu-card.c +++ b/sound/soc/generic/audio-graph-scu-card.c @@ -379,8 +379,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);