Merge branch 'asoc-4.20' into asoc-linus

[sfrench/cifs-2.6.git] / drivers / media / pci / cx23885 / cx23885-ioctl.c

diff --git a/drivers/media/pci/cx23885/cx23885-ioctl.c b/drivers/media/pci/cx23885/cx23885-ioctl.c
index d2cdd40f79f54611b9b6aa46ad7a0d5a9b00d9f0..d162bf4b4800e21e408c95c1d0cd6ac77be0ac42 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-ioctl.c
+++ b/drivers/media/pci/cx23885/cx23885-ioctl.c
@@ -31,9 +31,9 @@ int cx23885_g_chip_info(struct file *file, void *fh,
        if (chip->match.addr == 1) {
                if (dev->v4l_device == NULL)
                        return -EINVAL;
-               strlcpy(chip->name, "cx23417", sizeof(chip->name));
+               strscpy(chip->name, "cx23417", sizeof(chip->name));
        } else {
-               strlcpy(chip->name, dev->v4l2_dev.name, sizeof(chip->name));
+               strscpy(chip->name, dev->v4l2_dev.name, sizeof(chip->name));
        }
        return 0;
 }