diff mbox series

Applied "ASoC: core: fix return code in error message" to the asoc tree

Message ID E1fKn4n-0007Tc-PB@debutante
State Accepted
Commit 637917b1efe6a16cc4151f6508e82fc473814fe3
Headers show
Series Applied "ASoC: core: fix return code in error message" to the asoc tree | expand

Commit Message

Mark Brown May 21, 2018, 3:50 p.m. UTC 
The patch

   ASoC: core: fix return code in error message

has been applied to the asoc tree at

   https://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 637917b1efe6a16cc4151f6508e82fc473814fe3 Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@zonque.org>

Date: Sat, 19 May 2018 08:01:19 +0200
Subject: [PATCH] ASoC: core: fix return code in error message

Log the correct error code in case the .open() call to a component fails.

Signed-off-by: Daniel Mack <daniel@zonque.org>

Signed-off-by: Mark Brown <broonie@kernel.org>

---
 sound/soc/soc-pcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.17.0

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
diff mbox series

Patch

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 87c9af2158d0..2df4719a84db 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -498,7 +498,7 @@  static int soc_pcm_open(struct snd_pcm_substream *substream)
 		if (__ret < 0) {
 			dev_err(component->dev,
 				"ASoC: can't open component %s: %d\n",
-				component->name, ret);
+				component->name, __ret);
 			ret = __ret;
 		}
 	}