Merge tag 'media/v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[thirdparty/linux.git] / drivers / media / platform / vivid / vivid-sdr-cap.c

diff --git a/drivers/media/platform/vivid/vivid-sdr-cap.c b/drivers/media/platform/vivid/vivid-sdr-cap.c
index 76cf8810a9740d0544f434a966f68839a12bde1f..dcdc80e272c209132a57826edb9b15e68fbaf4fe 100644 (file)
--- a/drivers/media/platform/vivid/vivid-sdr-cap.c
+++ b/drivers/media/platform/vivid/vivid-sdr-cap.c
@@ -412,7 +412,7 @@ int vivid_sdr_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt)
 {
        switch (vt->index) {
        case 0:
-               strlcpy(vt->name, "ADC", sizeof(vt->name));
+               strscpy(vt->name, "ADC", sizeof(vt->name));
                vt->type = V4L2_TUNER_ADC;
                vt->capability =
                        V4L2_TUNER_CAP_1HZ | V4L2_TUNER_CAP_FREQ_BANDS;
@@ -420,7 +420,7 @@ int vivid_sdr_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt)
                vt->rangehigh = bands_adc[2].rangehigh;
                return 0;
        case 1:
-               strlcpy(vt->name, "RF", sizeof(vt->name));
+               strscpy(vt->name, "RF", sizeof(vt->name));
                vt->type = V4L2_TUNER_RF;
                vt->capability =
                        V4L2_TUNER_CAP_1HZ | V4L2_TUNER_CAP_FREQ_BANDS;