From 185f345ed930377d945397b2b710bf62d91f5fa4 Mon Sep 17 00:00:00 2001 From: Bryan Wu Date: Wed, 9 Jan 2013 10:29:55 -0800 Subject: media: v4l2: tegra: fixing memory access oops in tegra camera driver Function pointer int (*queue_setup)() of struct vb2_ops in include/media/videobuf2-core.h is not compatible with our function call tegra_camera_videobuf_setup(). So building will generate warning and it will cause alloc_ctxs[] with wrong value, then introduce memory access oops later. Bug 1215617 Change-Id: I5d49ccd611a9435a5ee3b21e344bc0b5464ba747 Signed-off-by: Bryan Wu Reviewed-on: http://git-master/r/190036 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Andrew Chew Reviewed-by: Winnie Hsu --- drivers/media/video/tegra_v4l2_camera.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/media/video/tegra_v4l2_camera.c') diff --git a/drivers/media/video/tegra_v4l2_camera.c b/drivers/media/video/tegra_v4l2_camera.c index 990f6afe8b10..644d0be53803 100644 --- a/drivers/media/video/tegra_v4l2_camera.c +++ b/drivers/media/video/tegra_v4l2_camera.c @@ -1058,10 +1058,9 @@ static void tegra_camera_init_buffer(struct tegra_camera_dev *pcdev, * Videobuf operations */ static int tegra_camera_videobuf_setup(struct vb2_queue *vq, - const struct v4l2_format *fmt, unsigned int *num_buffers, unsigned int *num_planes, - unsigned int sizes[], + unsigned long sizes[], void *alloc_ctxs[]) { struct soc_camera_device *icd = container_of(vq, @@ -1321,7 +1320,8 @@ static void tegra_camera_remove_device(struct soc_camera_device *icd) icd->devnum); } -static int tegra_camera_set_bus_param(struct soc_camera_device *icd) +static int tegra_camera_set_bus_param(struct soc_camera_device *icd, + __u32 pixfmt) { return 0; } -- cgit v1.2.3