From b84fb1da5375b0f7932e3c571c6f97ada38df88c Mon Sep 17 00:00:00 2001
From: Douglas Schilling Landgraf <dougsland@redhat.com>
Date: Sun, 8 Feb 2009 14:17:15 -0300
Subject: [PATCH] --- yaml --- r: 137873 b: refs/heads/master c:
 df39ca6437410b9428ebd3ce30fcde193782410d h: refs/heads/master i:   137871:
 1030877da4bfd6f62cf8ecae3d2437b367354c9f v: v3

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

diff --git a/[refs] b/[refs]
index 5853bbb9e473..a800131b0718 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c744dff260e9efb1080d1e823e588f85176a057b
+refs/heads/master: df39ca6437410b9428ebd3ce30fcde193782410d
diff --git a/trunk/drivers/media/video/em28xx/em28xx-audio.c b/trunk/drivers/media/video/em28xx/em28xx-audio.c
index 52c6657d61cf..8e9957dbdbec 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-audio.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-audio.c
@@ -381,19 +381,27 @@ static int snd_em28xx_capture_trigger(struct snd_pcm_substream *substream,
 				      int cmd)
 {
 	struct em28xx *dev = snd_pcm_substream_chip(substream);
+	int retval;
 
 	dprintk("Should %s capture\n", (cmd == SNDRV_PCM_TRIGGER_START)?
 				       "start": "stop");
+
+	spin_lock(&dev->adev.slock);
 	switch (cmd) {
 	case SNDRV_PCM_TRIGGER_START:
 		em28xx_cmd(dev, EM28XX_CAPTURE_STREAM_EN, 1);
-		return 0;
+		retval = 0;
+		break;
 	case SNDRV_PCM_TRIGGER_STOP:
 		em28xx_cmd(dev, EM28XX_CAPTURE_STREAM_EN, 0);
-		return 0;
+		retval = 0;
+		break;
 	default:
-		return -EINVAL;
+		retval = -EINVAL;
 	}
+
+	spin_unlock(&dev->adev.slock);
+	return retval;
 }
 
 static snd_pcm_uframes_t snd_em28xx_capture_pointer(struct snd_pcm_substream