| commit | 91fd3e918d5c6e6a78ea77620196d5f42df689dc | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Thu Oct 26 09:45:39 2017 +0200 |
| committer | Mark Brown <broonie@kernel.org> | Thu Oct 26 09:45:39 2017 +0200 |
| tree | ab6751d744f35b8ec9b514073bb35503488f7252 | |
| parent | 1ef6f346c62f386f28b0012d6379e2822a3842d3 [diff] | |
| parent | 32debfcd3ff0939c93238ddde03ffcc96cca5c60 [diff] |
Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index b659046..908211e 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -692,7 +692,6 @@ if (!pm_runtime_status_suspended(&pdev->dev)) i2s_runtime_suspend(&pdev->dev); - clk_disable_unprepare(i2s->mclk); clk_disable_unprepare(i2s->hclk); return 0;