From ae750a488d4ede6fd44085ad91dd8704d0b4def5 Mon Sep 17 00:00:00 2001
From: Douglas Schilling Landgraf <dougsland@redhat.com>
Date: Sun, 8 Feb 2009 10:45:34 -0300
Subject: [PATCH] --- yaml --- r: 137870 b: refs/heads/master c:
 3e099baff451affd13a93c6fed216943e01b80fd h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e34bf7094c62..e2143369d3e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56ee38071fe0cf1746d53c5b40a46a835b24fbe4
+refs/heads/master: 3e099baff451affd13a93c6fed216943e01b80fd
diff --git a/trunk/drivers/media/video/em28xx/em28xx-audio.c b/trunk/drivers/media/video/em28xx/em28xx-audio.c
index 43e8d7d91a96..7a62c77b8485 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 < dev->isoc_ctl.num_bufs; i++) {
+	for (i = 0; i < EM28XX_AUDIO_BUFS; i++) {
 		if (!irqs_disabled())
 			usb_kill_urb(dev->adev.urb[i]);
 		else
@@ -73,7 +73,6 @@ static int em28xx_isoc_audio_deinit(struct em28xx *dev)
 		dev->adev.transfer_buffer[i] = NULL;
 	}
 
-	dev->isoc_ctl.num_bufs = 0;
 	return 0;
 }
 
@@ -157,8 +156,6 @@ 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;
@@ -200,19 +197,10 @@ 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) {
-			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);
+			em28xx_isoc_audio_deinit(dev);
 
 			return errCode;
 		}
-		mutex_lock(&dev->lock);
-		dev->isoc_ctl.num_bufs++;
-		mutex_unlock(&dev->lock);
 	}
 
 	return 0;