diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-20 07:37:17 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-20 07:37:17 -0200 |
| commit | 75cd5f355fe382a2645a959e6ff2beffa09019da (patch) | |
| tree | d78404ed6886ea5ab11db15af0ec3deb1bbd9952 /linux/drivers/media/video/usbvision/usbvision-core.c | |
| parent | d70b230414d9b4799b0091981a1d4f9cd55d9a84 (diff) | |
| parent | 3842afc175a16c86d1f3b719f07a3bfddf3c7815 (diff) | |
| download | mediapointer-dvb-s2-75cd5f355fe382a2645a959e6ff2beffa09019da.tar.gz mediapointer-dvb-s2-75cd5f355fe382a2645a959e6ff2beffa09019da.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/usbvision/usbvision-core.c')
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-core.c | 3 |
1 files changed, 0 insertions, 3 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; |