aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/ivtv/ivtv-ioctl.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-04 09:26:45 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-26 09:42:36 -0400
commite6eb28c2207b9397d0ab56e238865a4ee95b7ef9 (patch)
tree5914411d203c71b6b1446e2e4ad592c92331f6da /drivers/media/pci/ivtv/ivtv-ioctl.c
parent06fce2861d5a4ebcff65e253b2b3e4406dc3ab24 (diff)
[media] v4l2: make vidioc_s_fbuf const
Write-only ioctls should have a const argument in the ioctl op. Do this conversion for vidioc_s_fbuf. Adding const for write-only ioctls was decided during the 2012 Media Workshop. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/ivtv/ivtv-ioctl.c')
-rw-r--r--drivers/media/pci/ivtv/ivtv-ioctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index 32a591062d0b..d3b32c2d034e 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -1427,7 +1427,7 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
1427 return 0; 1427 return 0;
1428} 1428}
1429 1429
1430static int ivtv_s_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb) 1430static int ivtv_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffer *fb)
1431{ 1431{
1432 struct ivtv_open_id *id = fh2id(fh); 1432 struct ivtv_open_id *id = fh2id(fh);
1433 struct ivtv *itv = id->itv; 1433 struct ivtv *itv = id->itv;
@@ -1444,7 +1444,7 @@ static int ivtv_s_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
1444 itv->osd_chroma_key_state = (fb->flags & V4L2_FBUF_FLAG_CHROMAKEY) != 0; 1444 itv->osd_chroma_key_state = (fb->flags & V4L2_FBUF_FLAG_CHROMAKEY) != 0;
1445 ivtv_set_osd_alpha(itv); 1445 ivtv_set_osd_alpha(itv);
1446 yi->track_osd = (fb->flags & V4L2_FBUF_FLAG_OVERLAY) != 0; 1446 yi->track_osd = (fb->flags & V4L2_FBUF_FLAG_OVERLAY) != 0;
1447 return ivtv_g_fbuf(file, fh, fb); 1447 return 0;
1448} 1448}
1449 1449
1450static int ivtv_overlay(struct file *file, void *fh, unsigned int on) 1450static int ivtv_overlay(struct file *file, void *fh, unsigned int on)