lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: soc_pcm_open: Add missing bailout tag

Browse Source 
The codec_dai needs to be shutdown should the machine startup fails.
This patch adds another bailout tag for that case and rename the tag
for configuration failures.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Jassi Brar
2010-02-25 11:24:53 +09:00
committed by Mark Brown
parent a0b62329bb
commit bb1c04784d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/soc-core.c
View File

@@ -427,24 +427,24 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
if (!runtime->hw.rates) { if (!runtime->hw.rates) {
printk(KERN_ERR "asoc: %s <-> %s No matching rates\n", printk(KERN_ERR "asoc: %s <-> %s No matching rates\n",
codec_dai->name, cpu_dai->name); codec_dai->name, cpu_dai->name);
goto machine_err; goto config_err;
} }
if (!runtime->hw.formats) { if (!runtime->hw.formats) {
printk(KERN_ERR "asoc: %s <-> %s No matching formats\n", printk(KERN_ERR "asoc: %s <-> %s No matching formats\n",
codec_dai->name, cpu_dai->name); codec_dai->name, cpu_dai->name);
goto machine_err; goto config_err;
} }
if (!runtime->hw.channels_min || !runtime->hw.channels_max) { if (!runtime->hw.channels_min || !runtime->hw.channels_max) {
printk(KERN_ERR "asoc: %s <-> %s No matching channels\n", printk(KERN_ERR "asoc: %s <-> %s No matching channels\n",
codec_dai->name, cpu_dai->name); codec_dai->name, cpu_dai->name);
goto machine_err; goto config_err;
} }
/* Symmetry only applies if we've already got an active stream. */ /* Symmetry only applies if we've already got an active stream. */
if (cpu_dai->active || codec_dai->active) { if (cpu_dai->active || codec_dai->active) {
ret = soc_pcm_apply_symmetry(substream); ret = soc_pcm_apply_symmetry(substream);
if (ret != 0) if (ret != 0)
goto machine_err; goto config_err;
} }
pr_debug("asoc: %s <-> %s info:\n", codec_dai->name, cpu_dai->name); pr_debug("asoc: %s <-> %s info:\n", codec_dai->name, cpu_dai->name);
@@ -464,10 +464,14 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
mutex_unlock(&pcm_mutex); mutex_unlock(&pcm_mutex);
return 0; return 0;
machine_err: config_err:
if (machine->ops && machine->ops->shutdown) if (machine->ops && machine->ops->shutdown)
machine->ops->shutdown(substream); machine->ops->shutdown(substream);
machine_err:
if (codec_dai->ops->shutdown)
codec_dai->ops->shutdown(substream, codec_dai);
codec_dai_err: codec_dai_err:
if (platform->pcm_ops->close) if (platform->pcm_ops->close)
platform->pcm_ops->close(substream); platform->pcm_ops->close(substream);