From 89189414c74644145048e6256a1a02a77e24ec68 Mon Sep 17 00:00:00 2001
From: Dylan Reid <dgreid@chromium.org>
Date: Sat, 1 Sep 2012 01:38:19 -0700
Subject: [PATCH] --- yaml --- r: 322899 b: refs/heads/master c:
 57b2d68863f281737d8596cb3d76d89d9cc54fd8 h: refs/heads/master i:   322897:
 9511d1d083d7f58d515ebab69d2af5af00ff53ad   322895:
 e62ad5bbd7f886a6ef36b5c3be4777c81abd1061 v: v3

---
 [refs]                        | 2 +-
 trunk/sound/soc/samsung/dma.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 118b63a0e241..526f269de89f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37f45cc54cb03cac4a6b865b32bc705bb0cb1d29
+refs/heads/master: 57b2d68863f281737d8596cb3d76d89d9cc54fd8
diff --git a/trunk/sound/soc/samsung/dma.c b/trunk/sound/soc/samsung/dma.c
index f3ebc38c10fe..b70964ea448c 100644
--- a/trunk/sound/soc/samsung/dma.c
+++ b/trunk/sound/soc/samsung/dma.c
@@ -34,9 +34,7 @@ static const struct snd_pcm_hardware dma_hardware = {
 	.info			= SNDRV_PCM_INFO_INTERLEAVED |
 				    SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				    SNDRV_PCM_INFO_MMAP |
-				    SNDRV_PCM_INFO_MMAP_VALID |
-				    SNDRV_PCM_INFO_PAUSE |
-				    SNDRV_PCM_INFO_RESUME,
+				    SNDRV_PCM_INFO_MMAP_VALID,
 	.formats		= SNDRV_PCM_FMTBIT_S16_LE |
 				    SNDRV_PCM_FMTBIT_U16_LE |
 				    SNDRV_PCM_FMTBIT_U8 |
@@ -248,15 +246,11 @@ static int dma_trigger(struct snd_pcm_substream *substream, int cmd)
 
 	switch (cmd) {
 	case SNDRV_PCM_TRIGGER_START:
-	case SNDRV_PCM_TRIGGER_RESUME:
-	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
 		prtd->state |= ST_RUNNING;
 		prtd->params->ops->trigger(prtd->params->ch);
 		break;
 
 	case SNDRV_PCM_TRIGGER_STOP:
-	case SNDRV_PCM_TRIGGER_SUSPEND:
-	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
 		prtd->state &= ~ST_RUNNING;
 		prtd->params->ops->stop(prtd->params->ch);
 		break;