aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/vivi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/vivi.c')
-rw-r--r--drivers/media/video/vivi.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 82755091648b..61a6608d6e61 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -871,7 +871,6 @@ static int vidiocgmbuf (struct file *file, void *priv, struct video_mbuf *mbuf)
871static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i) 871static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
872{ 872{
873 struct vivi_fh *fh=priv; 873 struct vivi_fh *fh=priv;
874 struct vivi_dev *dev = fh->dev;
875 874
876 if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) 875 if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
877 return -EINVAL; 876 return -EINVAL;
@@ -884,7 +883,6 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
884static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i) 883static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
885{ 884{
886 struct vivi_fh *fh=priv; 885 struct vivi_fh *fh=priv;
887 struct vivi_dev *dev = fh->dev;
888 886
889 if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) 887 if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
890 return -EINVAL; 888 return -EINVAL;
@@ -1056,8 +1054,6 @@ static ssize_t
1056vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos) 1054vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
1057{ 1055{
1058 struct vivi_fh *fh = file->private_data; 1056 struct vivi_fh *fh = file->private_data;
1059 struct vivi_dev *dev = fh->dev;
1060 struct videobuf_queue *q = &fh->vb_vidq;
1061 1057
1062 if (fh->type==V4L2_BUF_TYPE_VIDEO_CAPTURE) { 1058 if (fh->type==V4L2_BUF_TYPE_VIDEO_CAPTURE) {
1063 return videobuf_read_stream(&fh->vb_vidq, data, count, ppos, 0, 1059 return videobuf_read_stream(&fh->vb_vidq, data, count, ppos, 0,
@@ -1070,7 +1066,6 @@ static unsigned int
1070vivi_poll(struct file *file, struct poll_table_struct *wait) 1066vivi_poll(struct file *file, struct poll_table_struct *wait)
1071{ 1067{
1072 struct vivi_fh *fh = file->private_data; 1068 struct vivi_fh *fh = file->private_data;
1073 struct vivi_buffer *buf;
1074 struct videobuf_queue *q = &fh->vb_vidq; 1069 struct videobuf_queue *q = &fh->vb_vidq;
1075 1070
1076 dprintk(1,"%s\n",__FUNCTION__); 1071 dprintk(1,"%s\n",__FUNCTION__);