From e20d03b5ce8b073b536f8459570866e11306a131 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 3 Dec 2011 20:20:02 +0000 Subject: [PATCH] --- yaml --- r: 283901 b: refs/heads/master c: 06d07b6b1cf46ad1bfd15ab1ba84c0d7ee6dab31 h: refs/heads/master i: 283899: 812377c64eb3779947787e2fe553ee7fc32b7898 v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/omap-dmic.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 51cd0f66fef1..1207c53e0377 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6652ef8229e9953543f41d8e081c23e653f0044 +refs/heads/master: 06d07b6b1cf46ad1bfd15ab1ba84c0d7ee6dab31 diff --git a/trunk/sound/soc/omap/omap-dmic.c b/trunk/sound/soc/omap/omap-dmic.c index 9c73c0c70d39..0855c1cfa7fd 100644 --- a/trunk/sound/soc/omap/omap-dmic.c +++ b/trunk/sound/soc/omap/omap-dmic.c @@ -114,7 +114,6 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream, mutex_lock(&dmic->mutex); if (!dai->active) { - pm_runtime_get_sync(dmic->dev); snd_pcm_hw_constraint_msbits(substream->runtime, 0, 32, 24); dmic->active = 1; } else { @@ -133,10 +132,8 @@ static void omap_dmic_dai_shutdown(struct snd_pcm_substream *substream, mutex_lock(&dmic->mutex); - if (!dai->active) { - pm_runtime_put_sync(dmic->dev); + if (!dai->active) dmic->active = 0; - } mutex_unlock(&dmic->mutex); }