aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/usbvision/usbvision-video.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-video.c')
-rw-r--r--drivers/media/video/usbvision/usbvision-video.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index a9e5e08caec5..cd6c41d67899 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -179,7 +179,6 @@ MODULE_ALIAS(DRIVER_ALIAS);
179/* /sys/bus/usb/drivers/USBVision Video Grabber */ 179/* /sys/bus/usb/drivers/USBVision Video Grabber */
180/*****************************************************************************/ 180/*****************************************************************************/
181 181
182
183#define YES_NO(x) ((x) ? "Yes" : "No") 182#define YES_NO(x) ((x) ? "Yes" : "No")
184 183
185static inline struct usb_usbvision *cd_to_usbvision(struct device *cd) 184static inline struct usb_usbvision *cd_to_usbvision(struct device *cd)
@@ -370,7 +369,6 @@ static void usbvision_remove_sysfs(struct video_device *vdev)
370 } 369 }
371} 370}
372 371
373
374/* 372/*
375 * usbvision_open() 373 * usbvision_open()
376 * 374 *
@@ -388,7 +386,6 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
388 386
389 PDEBUG(DBG_IO, "open"); 387 PDEBUG(DBG_IO, "open");
390 388
391
392 usbvision_reset_powerOffTimer(usbvision); 389 usbvision_reset_powerOffTimer(usbvision);
393 390
394 if (usbvision->user) 391 if (usbvision->user)
@@ -442,9 +439,6 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
442 mutex_unlock(&usbvision->lock); 439 mutex_unlock(&usbvision->lock);
443 } 440 }
444 441
445 if (errCode) {
446 }
447
448 /* prepare queues */ 442 /* prepare queues */
449 usbvision_empty_framequeues(usbvision); 443 usbvision_empty_framequeues(usbvision);
450 444
@@ -495,8 +489,6 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
495 } 489 }
496 490
497 PDEBUG(DBG_IO, "success"); 491 PDEBUG(DBG_IO, "success");
498
499
500 return 0; 492 return 0;
501} 493}
502 494
@@ -1346,9 +1338,7 @@ static int usbvision_radio_close(struct inode *inode, struct file *file)
1346 usbvision_release(usbvision); 1338 usbvision_release(usbvision);
1347 } 1339 }
1348 1340
1349
1350 PDEBUG(DBG_IO, "success"); 1341 PDEBUG(DBG_IO, "success");
1351
1352 return errCode; 1342 return errCode;
1353} 1343}
1354 1344
@@ -1360,7 +1350,6 @@ static int usbvision_vbi_open(struct inode *inode, struct file *file)
1360{ 1350{
1361 /* TODO */ 1351 /* TODO */
1362 return -ENODEV; 1352 return -ENODEV;
1363
1364} 1353}
1365 1354
1366static int usbvision_vbi_close(struct inode *inode, struct file *file) 1355static int usbvision_vbi_close(struct inode *inode, struct file *file)
@@ -1899,7 +1888,6 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
1899 } 1888 }
1900 1889
1901 PDEBUG(DBG_PROBE, "success"); 1890 PDEBUG(DBG_PROBE, "success");
1902
1903} 1891}
1904 1892
1905static struct usb_driver usbvision_driver = { 1893static struct usb_driver usbvision_driver = {