summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSouptick Joarder <jrdr.linux@gmail.com>2019-08-25 17:25:41 -0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-08-26 10:46:56 -0300
commit9ca6f5120c89cdfcb6250449092692dd96db9c64 (patch)
tree0691bae7235e8d4cbb2ebc8d4599b2871b71a466
parent578c5ab074981b1e74331e58df4b8ef4439df563 (diff)
downloadlinux-0-day-9ca6f5120c89cdfcb6250449092692dd96db9c64.tar.gz
linux-0-day-9ca6f5120c89cdfcb6250449092692dd96db9c64.tar.xz
media: usbvision: Remove dead code
These codes are commented since v4.2-rc1. If there is no plan to enable the #else part in future, these can be removed forever. Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--drivers/media/usb/usbvision/usbvision-video.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index 0874526f599e6..cdc66adda7558 100644
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -965,7 +965,6 @@ static ssize_t usbvision_read(struct file *file, char __user *buf,
__func__,
(unsigned long)count, frame->bytes_read);
-#if 1
/*
* FIXME:
* For now, forget the frame if it has not been read in one shot.
@@ -974,15 +973,6 @@ static ssize_t usbvision_read(struct file *file, char __user *buf,
/* Mark it as available to be used again. */
frame->grabstate = frame_state_unused;
-#else
- if (frame->bytes_read >= frame->scanlength) {
- /* All data has been read */
- frame->bytes_read = 0;
-
- /* Mark it as available to be used again. */
- frame->grabstate = frame_state_unused;
- }
-#endif
return count;
}