The ctrlUrbLock has all it's users commented out, and so it's unused. This patch removes it. Signed-off-by: Daniel Walker --- drivers/media/video/usbvision/usbvision-core.c | 3 --- drivers/media/video/usbvision/usbvision-video.c | 1 - drivers/media/video/usbvision/usbvision.h | 1 - 3 files changed, 5 deletions(-) Index: linux-2.6.23/drivers/media/video/usbvision/usbvision-core.c =================================================================== --- linux-2.6.23.orig/drivers/media/video/usbvision/usbvision-core.c +++ linux-2.6.23/drivers/media/video/usbvision/usbvision-core.c @@ -1561,13 +1561,10 @@ static int usbvision_write_reg_irq(struc 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; Index: linux-2.6.23/drivers/media/video/usbvision/usbvision-video.c =================================================================== --- linux-2.6.23.orig/drivers/media/video/usbvision/usbvision-video.c +++ linux-2.6.23/drivers/media/video/usbvision/usbvision-video.c @@ -1650,7 +1650,6 @@ static struct usb_usbvision *usbvision_a goto err_exit; } init_waitqueue_head(&usbvision->ctrlUrb_wq); - init_MUTEX(&usbvision->ctrlUrbLock); /* to 1 == available */ usbvision_init_powerOffTimer(usbvision); Index: linux-2.6.23/drivers/media/video/usbvision/usbvision.h =================================================================== --- linux-2.6.23.orig/drivers/media/video/usbvision/usbvision.h +++ linux-2.6.23/drivers/media/video/usbvision/usbvision.h @@ -374,7 +374,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; -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/