diff options
| author |   Michael Krufky <mkrufky@m1k.net> | 2006-01-09 15:25:34 -0200 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 15:25:34 -0200 |
| commit | 50c25fff5385c6baf3114f7c369b0f75a29ac1e8 (patch) | |
| tree | 8931b703585db52ee9028d2bd0c2da5a06b0b36e /drivers/media/common | |
| parent | V4L/DVB (3216): saa7134 card #58 has a newer revision with a new subsystem ID (diff) | |
| download | linux-dev-50c25fff5385c6baf3114f7c369b0f75a29ac1e8.tar.xz linux-dev-50c25fff5385c6baf3114f7c369b0f75a29ac1e8.zip | |
V4L/DVB (3218): Whitespace cleanups
- minor whitespace cleanups
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
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) BUG(); return 0; } + return videobuf_mmap_mapper(q,vma); } 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 } struct saa7146_use_ops saa7146_vbi_uops = { - .init = vbi_init, - .open = vbi_open, + .init = vbi_init, + .open = vbi_open, .release = vbi_close, .irq_done = vbi_irq_done, - .read = vbi_read, + .read = vbi_read, }; 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) if (V4L2_FIELD_ANY == field) { field = (win->w.height > maxh/2) - ? V4L2_FIELD_INTERLACED - : V4L2_FIELD_TOP; + ? V4L2_FIELD_INTERLACED + : V4L2_FIELD_TOP; } switch (field) { case V4L2_FIELD_TOP: @@ -1114,10 +1114,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int return 0; } case VIDIOC_OVERLAY: - - - - { int on = *(int *)arg; int err = 0; @@ -1359,7 +1355,6 @@ static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) saa7146_buffer_queue(fh->dev,&vv->video_q,buf); } - static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb) { struct file *file = q->priv_data; |