diff options
Diffstat (limited to 'drivers/media/common')
-rw-r--r-- | drivers/media/common/saa7146_fops.c | 1 | ||||
-rw-r--r-- | drivers/media/common/saa7146_vbi.c | 6 | ||||
-rw-r--r-- | drivers/media/common/saa7146_video.c | 9 |
3 files changed, 6 insertions, 10 deletions
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index 09ec964dec5c..a9ff5b5af1cf 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146_fops.c | |||
@@ -332,6 +332,7 @@ static int fops_mmap(struct file *file, struct vm_area_struct * vma) | |||
332 | BUG(); | 332 | BUG(); |
333 | return 0; | 333 | return 0; |
334 | } | 334 | } |
335 | |||
335 | return videobuf_mmap_mapper(q,vma); | 336 | return videobuf_mmap_mapper(q,vma); |
336 | } | 337 | } |
337 | 338 | ||
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c index 063986ec16b5..468d3c959075 100644 --- a/drivers/media/common/saa7146_vbi.c +++ b/drivers/media/common/saa7146_vbi.c | |||
@@ -500,9 +500,9 @@ static ssize_t vbi_read(struct file *file, char __user *data, size_t count, loff | |||
500 | } | 500 | } |
501 | 501 | ||
502 | struct saa7146_use_ops saa7146_vbi_uops = { | 502 | struct saa7146_use_ops saa7146_vbi_uops = { |
503 | .init = vbi_init, | 503 | .init = vbi_init, |
504 | .open = vbi_open, | 504 | .open = vbi_open, |
505 | .release = vbi_close, | 505 | .release = vbi_close, |
506 | .irq_done = vbi_irq_done, | 506 | .irq_done = vbi_irq_done, |
507 | .read = vbi_read, | 507 | .read = vbi_read, |
508 | }; | 508 | }; |
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index 1d961023b837..7ebac7949df3 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c | |||
@@ -151,8 +151,8 @@ static int try_win(struct saa7146_dev *dev, struct v4l2_window *win) | |||
151 | 151 | ||
152 | if (V4L2_FIELD_ANY == field) { | 152 | if (V4L2_FIELD_ANY == field) { |
153 | field = (win->w.height > maxh/2) | 153 | field = (win->w.height > maxh/2) |
154 | ? V4L2_FIELD_INTERLACED | 154 | ? V4L2_FIELD_INTERLACED |
155 | : V4L2_FIELD_TOP; | 155 | : V4L2_FIELD_TOP; |
156 | } | 156 | } |
157 | switch (field) { | 157 | switch (field) { |
158 | case V4L2_FIELD_TOP: | 158 | case V4L2_FIELD_TOP: |
@@ -1114,10 +1114,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int | |||
1114 | return 0; | 1114 | return 0; |
1115 | } | 1115 | } |
1116 | case VIDIOC_OVERLAY: | 1116 | case VIDIOC_OVERLAY: |
1117 | |||
1118 | |||
1119 | |||
1120 | |||
1121 | { | 1117 | { |
1122 | int on = *(int *)arg; | 1118 | int on = *(int *)arg; |
1123 | int err = 0; | 1119 | int err = 0; |
@@ -1359,7 +1355,6 @@ static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) | |||
1359 | saa7146_buffer_queue(fh->dev,&vv->video_q,buf); | 1355 | saa7146_buffer_queue(fh->dev,&vv->video_q,buf); |
1360 | } | 1356 | } |
1361 | 1357 | ||
1362 | |||
1363 | static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb) | 1358 | static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb) |
1364 | { | 1359 | { |
1365 | struct file *file = q->priv_data; | 1360 | struct file *file = q->priv_data; |