mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

ASoC: fsl_sai: Keep symmetry for clk_enable() and clk_disable()

Browse source 
There are two functions haven't clk_disable_unprepare() if having error.
Thus fix them.

Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Reviewed-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Nicolin Chen 2013-12-20 16:41:00 +08:00 committed by Mark Brown
parent dd9f40602e
commit 1fb2d9d746
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sound/soc/fsl/fsl_sai.c
View file

@ -111,7 +111,7 @@ static int fsl_sai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
dev_err(cpu_dai->dev,
"Cannot set SAI's transmitter sysclk: %d\n",
ret);
return ret;
goto err_clk;
}
ret = fsl_sai_set_dai_sysclk_tr(cpu_dai, clk_id, freq,
@ -120,12 +120,13 @@ static int fsl_sai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
dev_err(cpu_dai->dev,
"Cannot set SAI's receiver sysclk: %d\n",
ret);
return ret;
goto err_clk;
}
err_clk:
clk_disable_unprepare(sai->clk);
return 0;
return ret;
}
static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
@ -222,7 +223,7 @@ static int fsl_sai_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
dev_err(cpu_dai->dev,
"Cannot set SAI's transmitter format: %d\n",
ret);
return ret;
goto err_clk;
}
ret = fsl_sai_set_dai_fmt_tr(cpu_dai, fmt, FSL_FMT_RECEIVER);
@ -230,12 +231,13 @@ static int fsl_sai_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
dev_err(cpu_dai->dev,
"Cannot set SAI's receiver format: %d\n",
ret);
return ret;
goto err_clk;
}
err_clk:
clk_disable_unprepare(sai->clk);
return 0;
return ret;
}
static int fsl_sai_hw_params(struct snd_pcm_substream *substream,