OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: samsung: Add proper error paths to s3c24xx I2S driver 

s3c2412_i2s_probe() might fail so driver has to revert work done by
s3c_i2sv2_probe() (clock enabling).  Missing doing this would lead to
clock enable in-balance.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2017-07-27 19:13:38 +02:00 committed by Mark Brown
parent 81ea6cc73c
commit 6f187f7ef1
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/samsung/s3c-i2s-v2.c
View File

@ -651,6 +651,15 @@ int s3c_i2sv2_probe(struct snd_soc_dai *dai,
} }
EXPORT_SYMBOL_GPL(s3c_i2sv2_probe); EXPORT_SYMBOL_GPL(s3c_i2sv2_probe);
void s3c_i2sv2_cleanup(struct snd_soc_dai *dai,
struct s3c_i2sv2_info *i2s)
{
clk_disable_unprepare(i2s->iis_pclk);
clk_put(i2s->iis_pclk);
i2s->iis_pclk = NULL;
}
EXPORT_SYMBOL_GPL(s3c_i2sv2_cleanup);
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int s3c2412_i2s_suspend(struct snd_soc_dai *dai) static int s3c2412_i2s_suspend(struct snd_soc_dai *dai)
{ {

7
sound/soc/samsung/s3c-i2s-v2.h
View File

@ -91,6 +91,13 @@ extern int s3c_i2sv2_probe(struct snd_soc_dai *dai,
struct s3c_i2sv2_info *i2s, struct s3c_i2sv2_info *i2s,
unsigned long base); unsigned long base);
/**
* s3c_i2sv2_cleanup - cleanup resources allocated in s3c_i2sv2_probe
* @dai: The ASoC DAI structure supplied to the original probe.
* @i2s: Our local i2s structure to fill in.
*/
extern void s3c_i2sv2_cleanup(struct snd_soc_dai *dai,
struct s3c_i2sv2_info *i2s);
/** /**
* s3c_i2sv2_register_component - register component and dai with soc core * s3c_i2sv2_register_component - register component and dai with soc core
* @dev: DAI device * @dev: DAI device

13
sound/soc/samsung/s3c2412-i2s.c
View File

@ -65,7 +65,8 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)
s3c2412_i2s.iis_cclk = devm_clk_get(dai->dev, "i2sclk"); s3c2412_i2s.iis_cclk = devm_clk_get(dai->dev, "i2sclk");
if (IS_ERR(s3c2412_i2s.iis_cclk)) { if (IS_ERR(s3c2412_i2s.iis_cclk)) {
pr_err("failed to get i2sclk clock\n"); pr_err("failed to get i2sclk clock\n");
return PTR_ERR(s3c2412_i2s.iis_cclk); ret = PTR_ERR(s3c2412_i2s.iis_cclk);
goto err;
} }
/* Set MPLL as the source for IIS CLK */ /* Set MPLL as the source for IIS CLK */
@ -73,20 +74,24 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)
clk_set_parent(s3c2412_i2s.iis_cclk, clk_get(NULL, "mpll")); clk_set_parent(s3c2412_i2s.iis_cclk, clk_get(NULL, "mpll"));
ret = clk_prepare_enable(s3c2412_i2s.iis_cclk); ret = clk_prepare_enable(s3c2412_i2s.iis_cclk);
if (ret) if (ret)
return ret; goto err;
s3c2412_i2s.iis_cclk = s3c2412_i2s.iis_pclk;
/* Configure the I2S pins (GPE0...GPE4) in correct mode */ /* Configure the I2S pins (GPE0...GPE4) in correct mode */
s3c_gpio_cfgall_range(S3C2410_GPE(0), 5, S3C_GPIO_SFN(2), s3c_gpio_cfgall_range(S3C2410_GPE(0), 5, S3C_GPIO_SFN(2),
S3C_GPIO_PULL_NONE); S3C_GPIO_PULL_NONE);
return 0; return 0;
err:
s3c_i2sv2_cleanup(dai, &s3c2412_i2s);
return ret;
} }
static int s3c2412_i2s_remove(struct snd_soc_dai *dai) static int s3c2412_i2s_remove(struct snd_soc_dai *dai)
{ {
clk_disable_unprepare(s3c2412_i2s.iis_cclk); clk_disable_unprepare(s3c2412_i2s.iis_cclk);
s3c_i2sv2_cleanup(dai, &s3c2412_i2s);
return 0; return 0;
} }