Applied "ASoC: Intel: Skylake: Fix to cleanup if skl_sst_dsp_init fails" to the asoc tree

Message ID E1ZtCWe-0006Dq-G4@finisterre
State New
Headers show

Commit Message

Mark Brown Nov. 2, 2015, 10:39 a.m.
The patch

   ASoC: Intel: Skylake: Fix to cleanup if skl_sst_dsp_init fails

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 44b69590a64f1f2694fd0dd38cd3efbe751f9a8a Mon Sep 17 00:00:00 2001
From: "Subhransu S. Prusty" <>

Date: Fri, 30 Oct 2015 20:34:19 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Fix to cleanup if skl_sst_dsp_init

This patch fixes the below warning reported by Dan by invoking
skl_sst_dsp_cleanup() in cleanup path on error and not bailing out

	sound/soc/intel/skylake/skl-sst.c:270 skl_sst_dsp_init()
	info: ignoring unreachable code.

Reported-by: Dan Carpenter <>
Signed-off-by: Subhransu S. Prusty <>

Signed-off-by: Vinod Koul <>

Signed-off-by: Mark Brown <>

 sound/soc/intel/skylake/skl-sst.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


Alsa-devel mailing list


diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c
index 3b83dc9..5c5a244 100644
--- a/sound/soc/intel/skylake/skl-sst.c
+++ b/sound/soc/intel/skylake/skl-sst.c
@@ -259,15 +259,16 @@  int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,
 	ret = sst->fw_ops.load_fw(sst);
 	if (ret < 0) {
 		dev_err(dev, "Load base fw failed : %d", ret);
-		return ret;
+		goto cleanup;
 	if (dsp)
 		*dsp = skl;
-	return 0;
+	return ret;
-	skl_ipc_free(&skl->ipc);
+	skl_sst_dsp_cleanup(dev, skl);
 	return ret;