From 0b1094881a5a37cc0034357b399592d93e781352 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 19 Jun 2011 13:39:31 -0300
Subject: [PATCH] --- yaml --- r: 261319 b: refs/heads/master c:
 dff0f8c279e34089128e9687d77bfc72dbb471bd h: refs/heads/master i:   261317:
 1ce80af77cf3a3171b836c254cc05bdb181a7155   261315:
 6fe1013c968bccfa92dba94438bf570d261ad861   261311:
 3cb7d57f8be6c0cc230c20af5d31a396b49bf585 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-audio.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 963be93ed004..65395e35b8b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: debb7241498001a0da10ee01b72f9ec1f9b1edc8
+refs/heads/master: dff0f8c279e34089128e9687d77bfc72dbb471bd
diff --git a/trunk/drivers/media/video/em28xx/em28xx-audio.c b/trunk/drivers/media/video/em28xx/em28xx-audio.c
index 5381f6d7427d..47f21a382546 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-audio.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-audio.c
@@ -249,6 +249,7 @@ static struct snd_pcm_hardware snd_em28xx_hw_capture = {
 	.info = SNDRV_PCM_INFO_BLOCK_TRANSFER |
 		SNDRV_PCM_INFO_MMAP           |
 		SNDRV_PCM_INFO_INTERLEAVED    |
+		SNDRV_PCM_INFO_BATCH	      |
 		SNDRV_PCM_INFO_MMAP_VALID,
 
 	.formats = SNDRV_PCM_FMTBIT_S16_LE,
@@ -401,11 +402,15 @@ static int snd_em28xx_capture_trigger(struct snd_pcm_substream *substream,
 	int retval = 0;
 
 	switch (cmd) {
+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: /* fall through */
+	case SNDRV_PCM_TRIGGER_RESUME: /* fall through */
 	case SNDRV_PCM_TRIGGER_START:
 		atomic_set(&dev->stream_started, 1);
 		break;
+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH: /* fall through */
+	case SNDRV_PCM_TRIGGER_SUSPEND: /* fall through */
 	case SNDRV_PCM_TRIGGER_STOP:
-		atomic_set(&dev->stream_started, 1);
+		atomic_set(&dev->stream_started, 0);
 		break;
 	default:
 		retval = -EINVAL;