mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
ASoC: samsung: Fix error handling for clock lookup
Return the error code we got from clk_get() and check to make sure that clk_prepare_enable() worked. Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
d683d0b690
commit
ba56447c35
1 changed files with 8 additions and 2 deletions
|
@ -972,6 +972,7 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
|
|||
{
|
||||
struct i2s_dai *i2s = to_info(dai);
|
||||
struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
|
||||
int ret;
|
||||
|
||||
if (other && other->clk) { /* If this is probe on secondary */
|
||||
samsung_asoc_init_dma_data(dai, &other->sec_dai->dma_playback,
|
||||
|
@ -989,9 +990,14 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
|
|||
if (IS_ERR(i2s->clk)) {
|
||||
dev_err(&i2s->pdev->dev, "failed to get i2s_clock\n");
|
||||
iounmap(i2s->addr);
|
||||
return -ENOENT;
|
||||
return PTR_ERR(i2s->clk);
|
||||
}
|
||||
|
||||
ret = clk_prepare_enable(i2s->clk);
|
||||
if (ret != 0) {
|
||||
dev_err(&i2s->pdev->dev, "failed to enable clock: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
clk_prepare_enable(i2s->clk);
|
||||
|
||||
samsung_asoc_init_dma_data(dai, &i2s->dma_playback, &i2s->dma_capture);
|
||||
|
||||
|
|
Loading…
Reference in a new issue