hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/media/radio/radio-raremono.c
....@@ -181,11 +181,9 @@
181181 {
182182 struct raremono_device *radio = video_drvdata(file);
183183
184
- strlcpy(v->driver, "radio-raremono", sizeof(v->driver));
185
- strlcpy(v->card, "Thanko's Raremono", sizeof(v->card));
184
+ strscpy(v->driver, "radio-raremono", sizeof(v->driver));
185
+ strscpy(v->card, "Thanko's Raremono", sizeof(v->card));
186186 usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info));
187
- v->device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
188
- v->capabilities = v->device_caps | V4L2_CAP_DEVICE_CAPS;
189187 return 0;
190188 }
191189
....@@ -212,7 +210,7 @@
212210 if (v->index > 0)
213211 return -EINVAL;
214212
215
- strlcpy(v->name, "AM/FM/SW", sizeof(v->name));
213
+ strscpy(v->name, "AM/FM/SW", sizeof(v->name));
216214 v->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
217215 V4L2_TUNER_CAP_FREQ_BANDS;
218216 v->rangelow = AM_FREQ_RANGE_LOW * 16;
....@@ -349,13 +347,14 @@
349347
350348 mutex_init(&radio->lock);
351349
352
- strlcpy(radio->vdev.name, radio->v4l2_dev.name,
350
+ strscpy(radio->vdev.name, radio->v4l2_dev.name,
353351 sizeof(radio->vdev.name));
354352 radio->vdev.v4l2_dev = &radio->v4l2_dev;
355353 radio->vdev.fops = &usb_raremono_fops;
356354 radio->vdev.ioctl_ops = &usb_raremono_ioctl_ops;
357355 radio->vdev.lock = &radio->lock;
358356 radio->vdev.release = video_device_release_empty;
357
+ radio->vdev.device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
359358 radio->v4l2_dev.release = raremono_device_release;
360359
361360 usb_set_intfdata(intf, &radio->v4l2_dev);