Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / mx3_camera.c

diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c
index aa871c2936b31d9bb821067932f2103889392539..b9cb4a436959b8bd82b535b87d326546f134069c 100644 (file)
--- a/drivers/media/video/mx3_camera.c
+++ b/drivers/media/video/mx3_camera.c
@@ -443,7 +443,7 @@ static void mx3_camera_init_videobuf(struct videobuf_queue *q,
                                       V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                       V4L2_FIELD_NONE,
                                       sizeof(struct mx3_camera_buffer), icd,
-                                      NULL);
+                                      &icd->video_lock);
 }
 
 /* First part of ipu_csi_init_interface() */
@@ -1186,13 +1186,12 @@ static int __devinit mx3_camera_probe(struct platform_device *pdev)
                goto egetres;
        }
 
-       mx3_cam = vmalloc(sizeof(*mx3_cam));
+       mx3_cam = vzalloc(sizeof(*mx3_cam));
        if (!mx3_cam) {
                dev_err(&pdev->dev, "Could not allocate mx3 camera object\n");
                err = -ENOMEM;
                goto ealloc;
        }
-       memset(mx3_cam, 0, sizeof(*mx3_cam));
 
        mx3_cam->clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(mx3_cam->clk)) {