Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/doc', 'asoc/topic/dpcm', 'asoc/topic/dwc' and 'asoc/topic/fsi' into asoc-next

This commit is contained in:
Mark Brown
2014-12-08 13:11:56 +00:00
7 mengubah file dengan 285 tambahan dan 63 penghapusan

Melihat File

@@ -842,12 +842,9 @@ static int fsi_clk_disable(struct device *dev,
return -EINVAL;
if (1 == clock->count--) {
if (clock->xck)
clk_disable(clock->xck);
if (clock->ick)
clk_disable(clock->ick);
if (clock->div)
clk_disable(clock->div);
clk_disable(clock->xck);
clk_disable(clock->ick);
clk_disable(clock->div);
}
return 0;