aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2010-02-26 10:23:10 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 03:53:45 -0400
commitc30b46e58b31a0fc420049e21117444862fc7cb7 (patch)
tree684db5e6880fa8df24df1893be2478c0d455fe27
parentcfe2cde6d33f15994ad34466ac4a08f5bb348948 (diff)
[media] v4l: subdev: Generic ioctl support
Instead of returning an error when receiving an ioctl call with an unsupported command, forward the call to the subdev core::ioctl handler. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/v4l2-framework.txt5
-rw-r--r--drivers/media/video/v4l2-subdev.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
index 77d96f4e3f50..f2df31b088c6 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -405,6 +405,11 @@ VIDIOC_UNSUBSCRIBE_EVENT
405 To properly support events, the poll() file operation is also 405 To properly support events, the poll() file operation is also
406 implemented. 406 implemented.
407 407
408Private ioctls
409
410 All ioctls not in the above list are passed directly to the sub-device
411 driver through the core::ioctl operation.
412
408 413
409I2C sub-device drivers 414I2C sub-device drivers
410---------------------- 415----------------------
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c
index 6e76f734c780..0b8064490676 100644
--- a/drivers/media/video/v4l2-subdev.c
+++ b/drivers/media/video/v4l2-subdev.c
@@ -276,7 +276,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
276 } 276 }
277#endif 277#endif
278 default: 278 default:
279 return -ENOIOCTLCMD; 279 return v4l2_subdev_call(sd, core, ioctl, cmd, arg);
280 } 280 }
281 281
282 return 0; 282 return 0;