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

91fd3e91 · Mark Brown · 1ef6f346 · 32debfcd · 91fd3e91
Commit 91fd3e91 authored Oct 26, 2017 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

sound/soc/rockchip/rockchip_i2s.c sound/soc/rockchip/rockchip_i2s.c +0 -1

No files found.
--- 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;