diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-03-15 05:10:40 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-24 05:47:00 -0400 |
commit | 314527acbbb3f33f72c2ef19d8cfabcada9912a5 (patch) | |
tree | 871021b9e888444f9f71f5c12ecf0272d77fdf8d /drivers/media/v4l2-core | |
parent | 2f73c7c582a685b3198b974cd6d964d0338f8ab5 (diff) |
[media] v4l2: pass std by value to the write-only s_std ioctl
This ioctl is defined as IOW, so pass the argument by value instead of by
reference. I could have chosen to add const instead, but this is 1) easier
to handle in drivers and 2) consistent with the s_std subdev operation.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r-- | drivers/media/v4l2-core/v4l2-ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 8ec8abe0ffe7..d80d8afba3fb 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c | |||
@@ -1383,15 +1383,15 @@ static int v4l_s_std(const struct v4l2_ioctl_ops *ops, | |||
1383 | struct file *file, void *fh, void *arg) | 1383 | struct file *file, void *fh, void *arg) |
1384 | { | 1384 | { |
1385 | struct video_device *vfd = video_devdata(file); | 1385 | struct video_device *vfd = video_devdata(file); |
1386 | v4l2_std_id *id = arg, norm; | 1386 | v4l2_std_id id = *(v4l2_std_id *)arg, norm; |
1387 | int ret; | 1387 | int ret; |
1388 | 1388 | ||
1389 | norm = (*id) & vfd->tvnorms; | 1389 | norm = id & vfd->tvnorms; |
1390 | if (vfd->tvnorms && !norm) /* Check if std is supported */ | 1390 | if (vfd->tvnorms && !norm) /* Check if std is supported */ |
1391 | return -EINVAL; | 1391 | return -EINVAL; |
1392 | 1392 | ||
1393 | /* Calls the specific handler */ | 1393 | /* Calls the specific handler */ |
1394 | ret = ops->vidioc_s_std(file, fh, &norm); | 1394 | ret = ops->vidioc_s_std(file, fh, norm); |
1395 | 1395 | ||
1396 | /* Updates standard information */ | 1396 | /* Updates standard information */ |
1397 | if (ret >= 0) | 1397 | if (ret >= 0) |