Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/doc', 'asoc/topic...

[firefly-linux-kernel-4.4.55.git] / sound / soc / sh / fsi.c

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 66fddec9543d0ecc1bb414871d035bc244abc521..8869971d7884b93e463db07bb304f23c71b3b2c3 100644 (file)
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -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;
@@ -1711,8 +1708,7 @@ static const struct snd_soc_dai_ops fsi_dai_ops = {
 static struct snd_pcm_hardware fsi_pcm_hardware = {
        .info =         SNDRV_PCM_INFO_INTERLEAVED      |
                        SNDRV_PCM_INFO_MMAP             |
-                       SNDRV_PCM_INFO_MMAP_VALID       |
-                       SNDRV_PCM_INFO_PAUSE,
+                       SNDRV_PCM_INFO_MMAP_VALID,
        .buffer_bytes_max       = 64 * 1024,
        .period_bytes_min       = 32,
        .period_bytes_max       = 8192,