From 50ba06be698c46b57666421dc4f90b3355fd2790 Mon Sep 17 00:00:00 2001
From: Daniel Walker <dwalker@mvista.com>
Date: Wed, 12 Dec 2007 18:37:54 -0300
Subject: [PATCH] --- yaml --- r: 76582 b: refs/heads/master c:
 1fe934ddfc8e6e5663c0308ae216219be87b8d4f h: refs/heads/master v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/media/video/usbvision/usbvision-core.c  | 3 ---
 trunk/drivers/media/video/usbvision/usbvision-video.c | 1 -
 trunk/drivers/media/video/usbvision/usbvision.h       | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 81d7997a2392..98b542d4ca49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 544e6175330c86ad87abeeb1b048f56bafd96c31
+refs/heads/master: 1fe934ddfc8e6e5663c0308ae216219be87b8d4f
diff --git a/trunk/drivers/media/video/usbvision/usbvision-core.c b/trunk/drivers/media/video/usbvision/usbvision-core.c
index 2038d409f1dc..9e404b87d000 100644
--- a/trunk/drivers/media/video/usbvision/usbvision-core.c
+++ b/trunk/drivers/media/video/usbvision/usbvision-core.c
@@ -1561,13 +1561,10 @@ static int usbvision_write_reg_irq(struct usb_usbvision *usbvision,int address,
 	if (len > 8) {
 		return -EFAULT;
 	}
-//	down(&usbvision->ctrlUrbLock);
 	if (usbvision->ctrlUrbBusy) {
-//		up(&usbvision->ctrlUrbLock);
 		return -EBUSY;
 	}
 	usbvision->ctrlUrbBusy = 1;
-//	up(&usbvision->ctrlUrbLock);
 
 	usbvision->ctrlUrbSetup.bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT;
 	usbvision->ctrlUrbSetup.bRequest     = USBVISION_OP_CODE;
diff --git a/trunk/drivers/media/video/usbvision/usbvision-video.c b/trunk/drivers/media/video/usbvision/usbvision-video.c
index 92e72910792b..b52b826a30be 100644
--- a/trunk/drivers/media/video/usbvision/usbvision-video.c
+++ b/trunk/drivers/media/video/usbvision/usbvision-video.c
@@ -1651,7 +1651,6 @@ static struct usb_usbvision *usbvision_alloc(struct usb_device *dev)
 		goto err_exit;
 	}
 	init_waitqueue_head(&usbvision->ctrlUrb_wq);
-	init_MUTEX(&usbvision->ctrlUrbLock);	/* to 1 == available */
 
 	usbvision_init_powerOffTimer(usbvision);
 
diff --git a/trunk/drivers/media/video/usbvision/usbvision.h b/trunk/drivers/media/video/usbvision/usbvision.h
index dd80a98780f2..20d7ec624999 100644
--- a/trunk/drivers/media/video/usbvision/usbvision.h
+++ b/trunk/drivers/media/video/usbvision/usbvision.h
@@ -370,7 +370,6 @@ struct usb_usbvision {
 	int ctrlUrbBusy;
 	struct usb_ctrlrequest ctrlUrbSetup;
 	wait_queue_head_t ctrlUrb_wq;					// Processes waiting
-	struct semaphore ctrlUrbLock;
 
 	/* configuration part */
 	int have_tuner;