Applied "ASoC: qdsp6: q6asm-dai: clean up a return" to the asoc tree

Message ID
State Superseded
Headers show
  • Applied "ASoC: qdsp6: q6asm-dai: clean up a return" to the asoc tree
Related show

Commit Message

Mark Brown Sept. 10, 2018, 11:35 a.m.
The patch

   ASoC: qdsp6: q6asm-dai: clean up a return

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 0712e0288b7602efbde95d95bca4c651ccad01b8 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <>

Date: Mon, 10 Sep 2018 11:40:48 +0300
Subject: [PATCH] ASoC: qdsp6: q6asm-dai: clean up a return

Smatch complains that if both "psubstream" and "csubstream" are NULL
then "ret" is uninitialized.  That probably can't happen, but it's
cleaner to just return zero anyway so let's do that.

Signed-off-by: Dan Carpenter <>

Acked-by: Srinivas Kandagatla <>

Signed-off-by: Mark Brown <>

 sound/soc/qcom/qdsp6/q6asm-dai.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Alsa-devel mailing list


diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c
index 9db9a2944ef2..c75fab38905d 100644
--- a/sound/soc/qcom/qdsp6/q6asm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6asm-dai.c
@@ -493,7 +493,7 @@  static int q6asm_dai_pcm_new(struct snd_soc_pcm_runtime *rtd)
-	return ret;
+	return 0;
 static void q6asm_dai_pcm_free(struct snd_pcm *pcm)