diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-03-07 05:18:37 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-03-11 09:06:53 -0400 |
commit | dd519bb34a09d86db720f8a65e7dee1a85b2e90f (patch) | |
tree | dc68633c2a98b9bb5015c5c39c230cc6f766f794 /drivers/media/v4l2-core/v4l2-dev.c | |
parent | 254a47770163f9322333660ebdabf99ba49873da (diff) |
[media] v4l2: add VIDIOC_G/S_EDID support to the v4l2 core
Support this ioctl as part of the v4l2 core. Use the new ioctl
name and struct v4l2_edid type in the existing core code.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-dev.c')
-rw-r--r-- | drivers/media/v4l2-core/v4l2-dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c index 95112f686ef0..634d863c05b4 100644 --- a/drivers/media/v4l2-core/v4l2-dev.c +++ b/drivers/media/v4l2-core/v4l2-dev.c | |||
@@ -701,6 +701,7 @@ static void determine_valid_ioctls(struct video_device *vdev) | |||
701 | SET_VALID_IOCTL(ops, VIDIOC_G_AUDIO, vidioc_g_audio); | 701 | SET_VALID_IOCTL(ops, VIDIOC_G_AUDIO, vidioc_g_audio); |
702 | SET_VALID_IOCTL(ops, VIDIOC_S_AUDIO, vidioc_s_audio); | 702 | SET_VALID_IOCTL(ops, VIDIOC_S_AUDIO, vidioc_s_audio); |
703 | SET_VALID_IOCTL(ops, VIDIOC_QUERY_DV_TIMINGS, vidioc_query_dv_timings); | 703 | SET_VALID_IOCTL(ops, VIDIOC_QUERY_DV_TIMINGS, vidioc_query_dv_timings); |
704 | SET_VALID_IOCTL(ops, VIDIOC_S_EDID, vidioc_s_edid); | ||
704 | } | 705 | } |
705 | if (is_tx) { | 706 | if (is_tx) { |
706 | SET_VALID_IOCTL(ops, VIDIOC_ENUMOUTPUT, vidioc_enum_output); | 707 | SET_VALID_IOCTL(ops, VIDIOC_ENUMOUTPUT, vidioc_enum_output); |
@@ -726,6 +727,7 @@ static void determine_valid_ioctls(struct video_device *vdev) | |||
726 | SET_VALID_IOCTL(ops, VIDIOC_G_DV_TIMINGS, vidioc_g_dv_timings); | 727 | SET_VALID_IOCTL(ops, VIDIOC_G_DV_TIMINGS, vidioc_g_dv_timings); |
727 | SET_VALID_IOCTL(ops, VIDIOC_ENUM_DV_TIMINGS, vidioc_enum_dv_timings); | 728 | SET_VALID_IOCTL(ops, VIDIOC_ENUM_DV_TIMINGS, vidioc_enum_dv_timings); |
728 | SET_VALID_IOCTL(ops, VIDIOC_DV_TIMINGS_CAP, vidioc_dv_timings_cap); | 729 | SET_VALID_IOCTL(ops, VIDIOC_DV_TIMINGS_CAP, vidioc_dv_timings_cap); |
730 | SET_VALID_IOCTL(ops, VIDIOC_G_EDID, vidioc_g_edid); | ||
729 | } | 731 | } |
730 | if (is_tx && (is_radio || is_sdr)) { | 732 | if (is_tx && (is_radio || is_sdr)) { |
731 | /* radio transmitter only ioctls */ | 733 | /* radio transmitter only ioctls */ |