aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-03-17 08:54:22 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-04-16 17:20:02 -0400
commit2dd477dbeb53937213d741db53110ac39ca245d1 (patch)
treea49b468e31cc692c8593f69633a81bdb05836e41 /include/uapi
parenta1d36d8c705e10ad92b021c129e2d81bd9fde39c (diff)
[media] v4l2-common.h: remove __user annotation in struct v4l2_edid
The edid array is copied to kernelspace by the v4l2 core, so drivers shouldn't see the __user annotation. This conforms to other structs like v4l2_ext_controls where the data pointed to is copied to from user to kernelspace. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/v4l2-common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/v4l2-common.h b/include/uapi/linux/v4l2-common.h
index 9bf508ad0957..2f6f8cafe773 100644
--- a/include/uapi/linux/v4l2-common.h
+++ b/include/uapi/linux/v4l2-common.h
@@ -75,7 +75,7 @@ struct v4l2_edid {
75 __u32 start_block; 75 __u32 start_block;
76 __u32 blocks; 76 __u32 blocks;
77 __u32 reserved[5]; 77 __u32 reserved[5];
78 __u8 __user *edid; 78 __u8 *edid;
79}; 79};
80 80
81#endif /* __V4L2_COMMON__ */ 81#endif /* __V4L2_COMMON__ */