ASoC: soc_pcm_open: Add missing bailout tag
PATCH 1/1 ASoC: soc_pcm_open: Add missing bailout tag
From: Jassi Brar <[email protected]>
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 <[email protected]>
--- sound/soc/soc-core.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)
sound/soc/soc-core.c +9 -5
@@ -427,24 +427,24 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)if (!runtime->hw.rates) {printk (KERN_ERR "asoc: %s <-> %s No matching rates\n" , codec_dai->name, cpu_dai->name); - goto machine_err; + goto config_err; }if (!runtime->hw.formats) {printk (KERN_ERR "asoc: %s <-> %s No matching formats\n" , codec_dai->name, cpu_dai->name); - goto machine_err; + goto config_err; }if (!runtime->hw.channels_min || !runtime->hw.channels_max) {printk (KERN_ERR "asoc: %s <-> %s No matching channels\n" , codec_dai->name, cpu_dai->name); - goto machine_err; + goto config_err; }/* Symmetry only applies if we've already got an active stream. */ if (cpu_dai->active || codec_dai->active) { ret =soc_pcm_apply_symmetry (substream);if (ret !=0 ) - goto machine_err; + goto config_err; }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);return 0 ; -machine_err: +config_err:if (machine->ops && machine->ops->shutdown) machine->ops->shutdown (substream); +machine_err: +if (codec_dai->ops->shutdown) + codec_dai->ops->shutdown (substream, codec_dai); + codec_dai_err:if (platform->pcm_ops->close) platform->pcm_ops->close (substream);
Signature · 1 line
1.6.2.5
Quoted 8 lines · On Thu, 2010-02-25 at 11:24 +0900, [email protected] wrote:
From: Jassi Brar <[email protected]>
The
codec_daineeds 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 <[email protected]>---
Acked-by Liam Girdwood <[email protected]>
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk
Quoted 7 lines · On Thu, Feb 25, 2010 at 11:24:53AM +0900, [email protected] wrote:
From: Jassi Brar <[email protected]>
The
codec_daineeds 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 <[email protected]>
Good spot - applied, thanks.