openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: Intel: Skylake: Fix to free resources for dsp_init failure 

unmap mmio and free memory resources if dsp_init fails.

Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Subhransu S. Prusty 2017-08-22 16:45:51 +05:30 committed by Mark Brown
parent 3b3011adad
commit f77d443c4c
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sound/soc/intel/skylake/skl-messages.c
View File

@ -277,8 +277,10 @@ int skl_init_dsp(struct skl *skl)
} }
ops = skl_get_dsp_ops(skl->pci->device); ops = skl_get_dsp_ops(skl->pci->device);
if (!ops) if (!ops) {
return -EIO; goto unmap_mmio;
ret = -EIO;
}
loader_ops = ops->loader_ops(); loader_ops = ops->loader_ops();
ret = ops->init(bus->dev, mmio_base, irq, ret = ops->init(bus->dev, mmio_base, irq,
@ -286,25 +288,35 @@ int skl_init_dsp(struct skl *skl)
&skl->skl_sst); &skl->skl_sst);
if (ret < 0) if (ret < 0)
return ret; goto unmap_mmio;
skl->skl_sst->dsp_ops = ops; skl->skl_sst->dsp_ops = ops;
cores = &skl->skl_sst->cores; cores = &skl->skl_sst->cores;
cores->count = ops->num_cores; cores->count = ops->num_cores;
cores->state = kcalloc(cores->count, sizeof(*cores->state), GFP_KERNEL); cores->state = kcalloc(cores->count, sizeof(*cores->state), GFP_KERNEL);
if (!cores->state) if (!cores->state) {
return -ENOMEM; ret = -ENOMEM;
goto unmap_mmio;
}
cores->usage_count = kcalloc(cores->count, sizeof(*cores->usage_count), cores->usage_count = kcalloc(cores->count, sizeof(*cores->usage_count),
GFP_KERNEL); GFP_KERNEL);
if (!cores->usage_count) { if (!cores->usage_count) {
kfree(cores->state); ret = -ENOMEM;
return -ENOMEM; goto free_core_state;
} }
dev_dbg(bus->dev, "dsp registration status=%d\n", ret); dev_dbg(bus->dev, "dsp registration status=%d\n", ret);
return 0;
free_core_state:
kfree(cores->state);
unmap_mmio:
iounmap(mmio_base);
return ret; return ret;
} }