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

[sfrench/cifs-2.6.git] / drivers / media / platform / s5p-mfc / s5p_mfc_enc.c

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index 3ad4f5073002c90ae561f8e142a1d60c44b9badf..8fcf627dedfbdbeddae804a52634bb16bccfe591 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -1313,8 +1313,8 @@ static int vidioc_querycap(struct file *file, void *priv,
 {
        struct s5p_mfc_dev *dev = video_drvdata(file);
 
-       strlcpy(cap->driver, S5P_MFC_NAME, sizeof(cap->driver));
-       strlcpy(cap->card, dev->vfd_enc->name, sizeof(cap->card));
+       strscpy(cap->driver, S5P_MFC_NAME, sizeof(cap->driver));
+       strscpy(cap->card, dev->vfd_enc->name, sizeof(cap->card));
        snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",
                 dev_name(&dev->plat_dev->dev));
        /*
@@ -1344,7 +1344,7 @@ static int vidioc_enum_fmt(struct file *file, struct v4l2_fmtdesc *f,
 
                if (j == f->index) {
                        fmt = &formats[i];
-                       strlcpy(f->description, fmt->name,
+                       strscpy(f->description, fmt->name,
                                sizeof(f->description));
                        f->pixelformat = fmt->fourcc;
                        return 0;
@@ -1621,9 +1621,9 @@ static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
                        mfc_err("Call on QBUF after EOS command\n");
                        return -EIO;
                }
-               return vb2_qbuf(&ctx->vq_src, buf);
+               return vb2_qbuf(&ctx->vq_src, NULL, buf);
        } else if (buf->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
-               return vb2_qbuf(&ctx->vq_dst, buf);
+               return vb2_qbuf(&ctx->vq_dst, NULL, buf);
        }
        return -EINVAL;
 }