aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-05-08 16:55:00 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-06-01 00:21:40 -0400
commit3805f201934e5384f6e941222dc1968cb638a88c (patch)
tree3e50271cc998fbcb10eabac725792cc27a285153 /include/media
parentcf69b808caf8e729949cf20446bec0b9ace033b7 (diff)
V4L/DVB: v4l2-subdev.h: fix enum_mbus_fmt prototype
enum_mbus_fmt received an index argument that was defined as an int instead of an unsigned int. This is now fixed. This had the knock-on effect that the index argument in the callback get_formats in soc_camera.h also had to be changed to unsigned int. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/soc_camera.h2
-rw-r--r--include/media/v4l2-subdev.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index c9a5bbfa6ab5..b8289c2f609b 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -66,7 +66,7 @@ struct soc_camera_host_ops {
66 * .get_formats() fail, .put_formats() will not be called at all, the 66 * .get_formats() fail, .put_formats() will not be called at all, the
67 * failing .get_formats() must then clean up internally. 67 * failing .get_formats() must then clean up internally.
68 */ 68 */
69 int (*get_formats)(struct soc_camera_device *, int, 69 int (*get_formats)(struct soc_camera_device *, unsigned int,
70 struct soc_camera_format_xlate *); 70 struct soc_camera_format_xlate *);
71 void (*put_formats)(struct soc_camera_device *); 71 void (*put_formats)(struct soc_camera_device *);
72 int (*cropcap)(struct soc_camera_device *, struct v4l2_cropcap *); 72 int (*cropcap)(struct soc_camera_device *, struct v4l2_cropcap *);
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index a88889355ae0..02c6f4d11ed3 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -246,7 +246,7 @@ struct v4l2_subdev_video_ops {
246 struct v4l2_dv_timings *timings); 246 struct v4l2_dv_timings *timings);
247 int (*g_dv_timings)(struct v4l2_subdev *sd, 247 int (*g_dv_timings)(struct v4l2_subdev *sd,
248 struct v4l2_dv_timings *timings); 248 struct v4l2_dv_timings *timings);
249 int (*enum_mbus_fmt)(struct v4l2_subdev *sd, int index, 249 int (*enum_mbus_fmt)(struct v4l2_subdev *sd, unsigned int index,
250 enum v4l2_mbus_pixelcode *code); 250 enum v4l2_mbus_pixelcode *code);
251 int (*g_mbus_fmt)(struct v4l2_subdev *sd, 251 int (*g_mbus_fmt)(struct v4l2_subdev *sd,
252 struct v4l2_mbus_framefmt *fmt); 252 struct v4l2_mbus_framefmt *fmt);