---

yaml --- r: 182844 b: refs/heads/master c: e473b84 h: refs/heads/master v: v3
git-mirror · Jan 26, 2010 · 16e2fdc · 16e2fdc
1 parent 6e37ab4
commit 16e2fdc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544
+refs/heads/master: e473b847424bd215b686cbc1e781e82c904ee967
diff --git a/trunk/sound/soc/davinci/davinci-mcasp.c b/trunk/sound/soc/davinci/davinci-mcasp.c
@@ -768,13 +768,12 @@ static int davinci_mcasp_trigger(struct snd_pcm_substream *substream,
 
 	switch (cmd) {
 	case SNDRV_PCM_TRIGGER_RESUME:
+	case SNDRV_PCM_TRIGGER_START:
+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
 		if (!dev->clk_active) {
 			clk_enable(dev->clk);
 			dev->clk_active = 1;
 		}
-		/* Fall through */
-	case SNDRV_PCM_TRIGGER_START:
-	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
 		davinci_mcasp_start(dev, substream->stream);
 		break;