diff options
| author | Arvind Yadav <arvind.yadav.cs@gmail.com> | 2017-07-25 15:44:31 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-26 13:00:27 +0100 |
| commit | f5c97c7b0438bec0aad9738af1baa698dae5bc09 (patch) | |
| tree | 58550e9d361c51c0e62de41cf002729cc7fead92 /sound | |
| parent | a7ad9a88300c813a945793e9dae84ceaf7809141 (diff) | |
| download | op-kernel-dev-f5c97c7b0438bec0aad9738af1baa698dae5bc09.zip op-kernel-dev-f5c97c7b0438bec0aad9738af1baa698dae5bc09.tar.gz | |
ASoC: samsung: i2s: Handle return value of clk_prepare_enable.
clk_prepare_enable() can fail here and we must check its return value.
Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/i2s.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index c9f87f7..daf7b89 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -551,7 +551,9 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, goto err; } - clk_prepare_enable(i2s->op_clk); + ret = clk_prepare_enable(i2s->op_clk); + if (ret) + goto err; i2s->rclk_srcrate = clk_get_rate(i2s->op_clk); /* Over-ride the other's */ @@ -1133,10 +1135,19 @@ static int i2s_runtime_suspend(struct device *dev) static int i2s_runtime_resume(struct device *dev) { struct i2s_dai *i2s = dev_get_drvdata(dev); + int ret; - clk_prepare_enable(i2s->clk); - if (i2s->op_clk) - clk_prepare_enable(i2s->op_clk); + ret = clk_prepare_enable(i2s->clk); + if (ret) + return ret; + + if (i2s->op_clk) { + ret = clk_prepare_enable(i2s->op_clk); + if (ret) { + clk_disable_unprepare(i2s->clk); + return ret; + } + } writel(i2s->suspend_i2scon, i2s->addr + I2SCON); writel(i2s->suspend_i2smod, i2s->addr + I2SMOD); |
