.. | .. |
---|
181 | 181 | { |
---|
182 | 182 | struct raremono_device *radio = video_drvdata(file); |
---|
183 | 183 | |
---|
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)); |
---|
186 | 186 | 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; |
---|
189 | 187 | return 0; |
---|
190 | 188 | } |
---|
191 | 189 | |
---|
.. | .. |
---|
212 | 210 | if (v->index > 0) |
---|
213 | 211 | return -EINVAL; |
---|
214 | 212 | |
---|
215 | | - strlcpy(v->name, "AM/FM/SW", sizeof(v->name)); |
---|
| 213 | + strscpy(v->name, "AM/FM/SW", sizeof(v->name)); |
---|
216 | 214 | v->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO | |
---|
217 | 215 | V4L2_TUNER_CAP_FREQ_BANDS; |
---|
218 | 216 | v->rangelow = AM_FREQ_RANGE_LOW * 16; |
---|
.. | .. |
---|
349 | 347 | |
---|
350 | 348 | mutex_init(&radio->lock); |
---|
351 | 349 | |
---|
352 | | - strlcpy(radio->vdev.name, radio->v4l2_dev.name, |
---|
| 350 | + strscpy(radio->vdev.name, radio->v4l2_dev.name, |
---|
353 | 351 | sizeof(radio->vdev.name)); |
---|
354 | 352 | radio->vdev.v4l2_dev = &radio->v4l2_dev; |
---|
355 | 353 | radio->vdev.fops = &usb_raremono_fops; |
---|
356 | 354 | radio->vdev.ioctl_ops = &usb_raremono_ioctl_ops; |
---|
357 | 355 | radio->vdev.lock = &radio->lock; |
---|
358 | 356 | radio->vdev.release = video_device_release_empty; |
---|
| 357 | + radio->vdev.device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO; |
---|
359 | 358 | radio->v4l2_dev.release = raremono_device_release; |
---|
360 | 359 | |
---|
361 | 360 | usb_set_intfdata(intf, &radio->v4l2_dev); |
---|