Merge tag 'devicetree-fixes-for-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / media / pci / saa7134 / saa7134-empress.c

diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c
index 66acfd35ffc601f84f3b8bc718aeb9896402ee17..9735bbb908e3cb02b59ce1892803029c508f15b8 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-empress.c
+++ b/drivers/media/pci/saa7134/saa7134-empress.c
@@ -100,7 +100,7 @@ static int empress_enum_fmt_vid_cap(struct file *file, void  *priv,
        if (f->index != 0)
                return -EINVAL;
 
-       strlcpy(f->description, "MPEG TS", sizeof(f->description));
+       strscpy(f->description, "MPEG TS", sizeof(f->description));
        f->pixelformat = V4L2_PIX_FMT_MPEG;
        f->flags = V4L2_FMT_FLAG_COMPRESSED;
        return 0;
@@ -265,9 +265,9 @@ static int empress_init(struct saa7134_dev *dev)
                 "%s empress (%s)", dev->name,
                 saa7134_boards[dev->board].name);
        v4l2_ctrl_handler_init(hdl, 21);
-       v4l2_ctrl_add_handler(hdl, &dev->ctrl_handler, empress_ctrl_filter);
+       v4l2_ctrl_add_handler(hdl, &dev->ctrl_handler, empress_ctrl_filter, false);
        if (dev->empress_sd)
-               v4l2_ctrl_add_handler(hdl, dev->empress_sd->ctrl_handler, NULL);
+               v4l2_ctrl_add_handler(hdl, dev->empress_sd->ctrl_handler, NULL, true);
        if (hdl->error) {
                video_device_release(dev->empress_dev);
                return hdl->error;