Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[sfrench/cifs-2.6.git] / drivers / media / platform / omap3isp / ispvideo.c

diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index 9d228eac24ea538c45dac5dd15123193587f0bc4..078d64114b2410daca82f24f9afb07c45b38ab64 100644 (file)
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -654,9 +654,9 @@ isp_video_querycap(struct file *file, void *fh, struct v4l2_capability *cap)
 {
        struct isp_video *video = video_drvdata(file);
 
-       strlcpy(cap->driver, ISP_VIDEO_DRIVER_NAME, sizeof(cap->driver));
-       strlcpy(cap->card, video->video.name, sizeof(cap->card));
-       strlcpy(cap->bus_info, "media", sizeof(cap->bus_info));
+       strscpy(cap->driver, ISP_VIDEO_DRIVER_NAME, sizeof(cap->driver));
+       strscpy(cap->card, video->video.name, sizeof(cap->card));
+       strscpy(cap->bus_info, "media", sizeof(cap->bus_info));
 
        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT
                | V4L2_CAP_STREAMING | V4L2_CAP_DEVICE_CAPS;
@@ -940,7 +940,7 @@ isp_video_qbuf(struct file *file, void *fh, struct v4l2_buffer *b)
        int ret;
 
        mutex_lock(&video->queue_lock);
-       ret = vb2_qbuf(&vfh->queue, b);
+       ret = vb2_qbuf(&vfh->queue, video->video.v4l2_dev->mdev, b);
        mutex_unlock(&video->queue_lock);
 
        return ret;
@@ -1028,7 +1028,7 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
        ctrls.count = 1;
        ctrls.controls = &ctrl;
 
-       ret = v4l2_g_ext_ctrls(pipe->external->ctrl_handler, &ctrls);
+       ret = v4l2_g_ext_ctrls(pipe->external->ctrl_handler, NULL, &ctrls);
        if (ret < 0) {
                dev_warn(isp->dev, "no pixel rate control in subdev %s\n",
                         pipe->external->name);
@@ -1251,7 +1251,7 @@ isp_video_enum_input(struct file *file, void *fh, struct v4l2_input *input)
        if (input->index > 0)
                return -EINVAL;
 
-       strlcpy(input->name, "camera", sizeof(input->name));
+       strscpy(input->name, "camera", sizeof(input->name));
        input->type = V4L2_INPUT_TYPE_CAMERA;
 
        return 0;