From df0a8cc43eca177fe2fc9f80a17fe89ad0ed7ed9 Mon Sep 17 00:00:00 2001
From: Douglas Schilling Landgraf <dougsland@redhat.com>
Date: Sun, 25 Jan 2009 19:19:23 -0300
Subject: [PATCH] --- yaml --- r: 137749 b: refs/heads/master c:
 b124d597496fad3ba1ead7ed3b6c197c5b0a2ee7 h: refs/heads/master i:   137747:
 ccc017b1225f7af75f36137621f36e455ab11280 v: v3

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

diff --git a/[refs] b/[refs]
index 96e8e275f5b3..43e2986f7cb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00bc0645f02ec0c3486a9f6af9b6167ce5eda62c
+refs/heads/master: b124d597496fad3ba1ead7ed3b6c197c5b0a2ee7
diff --git a/trunk/drivers/media/video/em28xx/em28xx-audio.c b/trunk/drivers/media/video/em28xx/em28xx-audio.c
index 7a62c77b8485..43e8d7d91a96 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-audio.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-audio.c
@@ -61,7 +61,7 @@ static int em28xx_isoc_audio_deinit(struct em28xx *dev)
 	int i;
 
 	dprintk("Stopping isoc\n");
-	for (i = 0; i < EM28XX_AUDIO_BUFS; i++) {
+	for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
 		if (!irqs_disabled())
 			usb_kill_urb(dev->adev.urb[i]);
 		else
@@ -73,6 +73,7 @@ static int em28xx_isoc_audio_deinit(struct em28xx *dev)
 		dev->adev.transfer_buffer[i] = NULL;
 	}
 
+	dev->isoc_ctl.num_bufs = 0;
 	return 0;
 }
 
@@ -156,6 +157,8 @@ static int em28xx_init_audio_isoc(struct em28xx *dev)
 
 	dprintk("Starting isoc transfers\n");
 
+	dev->isoc_ctl.num_bufs = 0;
+
 	for (i = 0; i < EM28XX_AUDIO_BUFS; i++) {
 		struct urb *urb;
 		int j, k;
@@ -197,10 +200,19 @@ static int em28xx_init_audio_isoc(struct em28xx *dev)
 	for (i = 0; i < EM28XX_AUDIO_BUFS; i++) {
 		errCode = usb_submit_urb(dev->adev.urb[i], GFP_ATOMIC);
 		if (errCode) {
-			em28xx_isoc_audio_deinit(dev);
+			if (dev->isoc_ctl.num_bufs == 0) {
+				usb_free_urb(dev->adev.urb[i]);
+				dev->adev.urb[i] = NULL;
+				kfree(dev->adev.transfer_buffer[i]);
+				dev->adev.transfer_buffer[i] = NULL;
+			} else
+				em28xx_isoc_audio_deinit(dev);
 
 			return errCode;
 		}
+		mutex_lock(&dev->lock);
+		dev->isoc_ctl.num_bufs++;
+		mutex_unlock(&dev->lock);
 	}
 
 	return 0;