Applied "ASoC: audio-graph-scu-card: tidyup return method from probe()" to the asoc tree

Message ID E1dFLFn-0001N0-9m@finisterre
State New
Headers show

Commit Message

Mark Brown May 29, 2017, 2:02 p.m.
The patch

   ASoC: audio-graph-scu-card: tidyup return method from probe()

has been applied to the asoc tree at


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.


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(-)


Alsa-devel mailing list


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;