Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b3011ad authored by Subhransu S. Prusty's avatar Subhransu S. Prusty Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Fix to free dsp resource on ipc_init failure 



For some dsp init error path, irq and few more resources are not freed.
This results in oops. So, fix it by freeing up the resources on ipc_init
failure.

Signed-off-by: default avatarSubhransu S. Prusty <subhransu.s.prusty@intel.com>
Acked-By: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 80b64903

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

+3 −1
Original line number Diff line number Diff line
@@ -582,8 +582,10 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, 
			SKL_ADSP_W0_UP_SZ, BXT_ADSP_SRAM1_BASE, SKL_ADSP_W1_SZ);



	ret = skl_ipc_init(dev, skl);

	if (ret)

	if (ret) {

		skl_dsp_free(sst);

		return ret;

	}



	/* set the D0i3 check */

	skl->ipc.ops.check_dsp_lp_on = skl_ipc_check_D0i0;

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

+3 −1
Original line number Diff line number Diff line
@@ -450,8 +450,10 @@ int cnl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, 
			     CNL_ADSP_W1_SZ);



	ret = cnl_ipc_init(dev, cnl);

	if (ret)

	if (ret) {

		skl_dsp_free(sst);

		return ret;

	}



	cnl->boot_complete = false;

	init_waitqueue_head(&cnl->boot_wait);

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

+3 −1
Original line number Diff line number Diff line
@@ -562,8 +562,10 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, 
			SKL_ADSP_W0_UP_SZ, SKL_ADSP_SRAM1_BASE, SKL_ADSP_W1_SZ);



	ret = skl_ipc_init(dev, skl);

	if (ret)

	if (ret) {

		skl_dsp_free(sst);

		return ret;

	}



	sst->fw_ops = skl_fw_ops;