aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/media/v4l2-mediabus.h2
-rw-r--r--include/media/v4l2-subdev.h2
-rw-r--r--include/uapi/linux/v4l2-subdev.h6
3 files changed, 5 insertions, 5 deletions
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index 395c4a95a42a..59d7397fb0ea 100644
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -98,7 +98,7 @@ static inline void v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt,
98 98
99static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt, 99static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt,
100 const struct v4l2_pix_format *pix_fmt, 100 const struct v4l2_pix_format *pix_fmt,
101 enum v4l2_mbus_pixelcode code) 101 u32 code)
102{ 102{
103 mbus_fmt->width = pix_fmt->width; 103 mbus_fmt->width = pix_fmt->width;
104 mbus_fmt->height = pix_fmt->height; 104 mbus_fmt->height = pix_fmt->height;
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index d7465725773d..5860292d42eb 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -341,7 +341,7 @@ struct v4l2_subdev_video_ops {
341 int (*query_dv_timings)(struct v4l2_subdev *sd, 341 int (*query_dv_timings)(struct v4l2_subdev *sd,
342 struct v4l2_dv_timings *timings); 342 struct v4l2_dv_timings *timings);
343 int (*enum_mbus_fmt)(struct v4l2_subdev *sd, unsigned int index, 343 int (*enum_mbus_fmt)(struct v4l2_subdev *sd, unsigned int index,
344 enum v4l2_mbus_pixelcode *code); 344 u32 *code);
345 int (*enum_mbus_fsizes)(struct v4l2_subdev *sd, 345 int (*enum_mbus_fsizes)(struct v4l2_subdev *sd,
346 struct v4l2_frmsizeenum *fsize); 346 struct v4l2_frmsizeenum *fsize);
347 int (*g_mbus_fmt)(struct v4l2_subdev *sd, 347 int (*g_mbus_fmt)(struct v4l2_subdev *sd,
diff --git a/include/uapi/linux/v4l2-subdev.h b/include/uapi/linux/v4l2-subdev.h
index a619cdd300ac..e0a7e3da498a 100644
--- a/include/uapi/linux/v4l2-subdev.h
+++ b/include/uapi/linux/v4l2-subdev.h
@@ -68,7 +68,7 @@ struct v4l2_subdev_crop {
68 * struct v4l2_subdev_mbus_code_enum - Media bus format enumeration 68 * struct v4l2_subdev_mbus_code_enum - Media bus format enumeration
69 * @pad: pad number, as reported by the media API 69 * @pad: pad number, as reported by the media API
70 * @index: format index during enumeration 70 * @index: format index during enumeration
71 * @code: format code (from enum v4l2_mbus_pixelcode) 71 * @code: format code (MEDIA_BUS_FMT_ definitions)
72 */ 72 */
73struct v4l2_subdev_mbus_code_enum { 73struct v4l2_subdev_mbus_code_enum {
74 __u32 pad; 74 __u32 pad;
@@ -81,7 +81,7 @@ struct v4l2_subdev_mbus_code_enum {
81 * struct v4l2_subdev_frame_size_enum - Media bus format enumeration 81 * struct v4l2_subdev_frame_size_enum - Media bus format enumeration
82 * @pad: pad number, as reported by the media API 82 * @pad: pad number, as reported by the media API
83 * @index: format index during enumeration 83 * @index: format index during enumeration
84 * @code: format code (from enum v4l2_mbus_pixelcode) 84 * @code: format code (MEDIA_BUS_FMT_ definitions)
85 */ 85 */
86struct v4l2_subdev_frame_size_enum { 86struct v4l2_subdev_frame_size_enum {
87 __u32 index; 87 __u32 index;
@@ -109,7 +109,7 @@ struct v4l2_subdev_frame_interval {
109 * struct v4l2_subdev_frame_interval_enum - Frame interval enumeration 109 * struct v4l2_subdev_frame_interval_enum - Frame interval enumeration
110 * @pad: pad number, as reported by the media API 110 * @pad: pad number, as reported by the media API
111 * @index: frame interval index during enumeration 111 * @index: frame interval index during enumeration
112 * @code: format code (from enum v4l2_mbus_pixelcode) 112 * @code: format code (MEDIA_BUS_FMT_ definitions)
113 * @width: frame width in pixels 113 * @width: frame width in pixels
114 * @height: frame height in pixels 114 * @height: frame height in pixels
115 * @interval: frame interval in seconds 115 * @interval: frame interval in seconds