Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
	Mark Brown <broonie@kernel.org>Mark Brown
	<broonie@kernel.org>Dan Carpenter <dan.carpenter@oracle.com>,
	Linux-Renesas <linux-renesas-soc@vger.kernel.org>,
	Linux-ALSA <alsa-devel@alsa-project.org>,
	Simon <horms@verge.net.au>alsa-devel@alsa-project.org
Subject: Applied "ASoC: audio-graph-scu-card: tidyup return method from probe()" to the asoc tree
Date: Mon, 29 May 2017 15:02:39 +0100	[thread overview]
Message-ID: <E1dFLFn-0001N0-9m@finisterre> (raw)
In-Reply-To: <87mva93bw4.wl%kuninori.morimoto.gx@renesas.com>

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 <kuninori.morimoto.gx@renesas.com>
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 <dan.carpenter@oracle.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/generic/audio-graph-scu-card.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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);
 
-- 
2.11.0

  reply	other threads:[~2017-05-29 14:02 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-19  0:54 [PATCH 0/4] ASoC: tidyup return method from probe() Kuninori Morimoto
2017-05-19  0:57 ` [PATCH 1/4] ASoC: simple-card: " Kuninori Morimoto
2017-05-19 17:04   ` Applied "ASoC: simple-card: tidyup return method from probe()" to the asoc tree Mark Brown
2017-05-19  0:57 ` [PATCH 2/4] ASoC: simple-scu-card: tidyup return method from probe() Kuninori Morimoto
2017-05-19 17:04   ` Applied "ASoC: simple-scu-card: tidyup return method from probe()" to the asoc tree Mark Brown
2017-05-19  0:58 ` [PATCH 3/4] ASoC: audio-graph-card: tidyup return method from probe() Kuninori Morimoto
2017-05-19 17:04   ` Applied "ASoC: audio-graph-card: tidyup return method from probe()" to the asoc tree Mark Brown
2017-05-19  0:58 ` [PATCH 4/4] ASoC: audio-graph-scu-card: tidyup return method from probe() Kuninori Morimoto
2017-05-29 14:02   ` Mark Brown [this message]
2017-05-19  6:10 ` [PATCH 0/4] ASoC: " Dan Carpenter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1dFLFn-0001N0-9m@finisterre \
    --to=broonie@kernel.org \
    --cc=dan.carpenter@oracle.com \
    --cc=kuninori.morimoto.gx@renesas.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox