From 16e2fdc9c43e4dd918a310f965aae7a7e86f51d1 Mon Sep 17 00:00:00 2001
From: Chaithrika U S <chaithrika@ti.com>
Date: Wed, 20 Jan 2010 17:06:33 +0530
Subject: [PATCH] --- yaml --- r: 182844 b: refs/heads/master c:
 e473b847424bd215b686cbc1e781e82c904ee967 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/sound/soc/davinci/davinci-mcasp.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index dd8619f5f714..38da8e0fef17 100644
--- 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
index a613bbb0bc91..ab6518d86f18 100644
--- 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;