Commit b4fe965f authored Oct 30, 2015 by Subhransu S. Prusty Committed by Mark Brown Nov 16, 2015

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



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 <dan.carpenter@oracle.com>
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent aaec7e9f

sound/soc/intel/skylake/skl-sst.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -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);
		cleanup:
		skl_sst_dsp_cleanup(dev, skl);
		return ret;
		}
		EXPORT_SYMBOL_GPL(skl_sst_dsp_init);

Admin message