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 b6590467fd140c9cbfa8e802af70a5fe390da9f4..908211e1d6fcb46eb8e0d7d8401a892967ba156a 100644 (file)
--- 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;