diff options
| author | Thierry MERLE <thierry.merle@free.fr> | 2007-12-12 22:37:54 +0100 |
|---|---|---|
| committer | Thierry MERLE <thierry.merle@free.fr> | 2007-12-12 22:37:54 +0100 |
| commit | e4be4ca4e052d77fbf7e19b7a88d4da1ad1aa64e (patch) | |
| tree | 8dc796ff9c38ae591848ef7baee421c166fa0ca2 | |
| parent | af0e3689d502650b164b118360f25423eb0b1797 (diff) | |
| download | mediapointer-dvb-s2-e4be4ca4e052d77fbf7e19b7a88d4da1ad1aa64e.tar.gz mediapointer-dvb-s2-e4be4ca4e052d77fbf7e19b7a88d4da1ad1aa64e.tar.bz2 | |
media: video: usbvision: remove ctrlUrbLock
From: Daniel Walker <dwalker@mvista.com>
The ctrlUrbLock has all it's users commented out, and so it's unused. This
patch removes it.
Signed-off-by: Daniel Walker <dwalker@mvista.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-core.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-video.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision.h | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision-core.c b/linux/drivers/media/video/usbvision/usbvision-core.c index 996203969..96fcd5987 100644 --- a/linux/drivers/media/video/usbvision/usbvision-core.c +++ b/linux/drivers/media/video/usbvision/usbvision-core.c @@ -1611,13 +1611,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); #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20) usbvision->ctrlUrbSetup.requesttype = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT; diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c index e0b079baf..385b4709a 100644 --- a/linux/drivers/media/video/usbvision/usbvision-video.c +++ b/linux/drivers/media/video/usbvision/usbvision-video.c @@ -1808,7 +1808,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/linux/drivers/media/video/usbvision/usbvision.h b/linux/drivers/media/video/usbvision/usbvision.h index 3b3f1ca0e..9f4c40dbf 100644 --- a/linux/drivers/media/video/usbvision/usbvision.h +++ b/linux/drivers/media/video/usbvision/usbvision.h @@ -373,7 +373,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; |