Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus

2017-10-26 09:45:39 +02:00 · 2017-10-26 09:45:39 +02:00 · 91fd3e918d
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@ -692,7 +692,6 @@ static int rockchip_i2s_remove(struct platform_device *pdev)
 	if (!pm_runtime_status_suspended(&pdev->dev))
 		i2s_runtime_suspend(&pdev->dev);

-	clk_disable_unprepare(i2s->mclk);
 	clk_disable_unprepare(i2s->hclk);

 	return 0;