未验证 提交 57d71453 编写于 作者: P Pierre-Louis Bossart 提交者: Mark Brown
上级 37cb8a58
...@@ -346,11 +346,9 @@ static int img_i2s_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -346,11 +346,9 @@ static int img_i2s_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
chan_control_mask = IMG_I2S_OUT_CHAN_CTL_CLKT_MASK; chan_control_mask = IMG_I2S_OUT_CHAN_CTL_CLKT_MASK;
ret = pm_runtime_get_sync(i2s->dev); ret = pm_runtime_resume_and_get(i2s->dev);
if (ret < 0) { if (ret < 0)
pm_runtime_put_noidle(i2s->dev);
return ret; return ret;
}
img_i2s_out_disable(i2s); img_i2s_out_disable(i2s);
...@@ -482,11 +480,9 @@ static int img_i2s_out_probe(struct platform_device *pdev) ...@@ -482,11 +480,9 @@ static int img_i2s_out_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_pm_disable; goto err_pm_disable;
} }
ret = pm_runtime_get_sync(&pdev->dev); ret = pm_runtime_resume_and_get(&pdev->dev);
if (ret < 0) { if (ret < 0)
pm_runtime_put_noidle(&pdev->dev);
goto err_suspend; goto err_suspend;
}
reg = IMG_I2S_OUT_CTL_FRM_SIZE_MASK; reg = IMG_I2S_OUT_CTL_FRM_SIZE_MASK;
img_i2s_out_writel(i2s, reg, IMG_I2S_OUT_CTL); img_i2s_out_writel(i2s, reg, IMG_I2S_OUT_CTL);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册