---

yaml --- r: 283901 b: refs/heads/master c: 06d07b6 h: refs/heads/master i: 283899: 812377c v: v3
git-mirror · Dec 8, 2011 · e20d03b · e20d03b
1 parent fd08747
commit e20d03b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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);
 }