hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/media/radio/si4713/radio-usb-si4713.c
....@@ -67,12 +67,9 @@
6767 {
6868 struct si4713_usb_device *radio = video_drvdata(file);
6969
70
- strlcpy(v->driver, "radio-usb-si4713", sizeof(v->driver));
71
- strlcpy(v->card, "Si4713 FM Transmitter", sizeof(v->card));
70
+ strscpy(v->driver, "radio-usb-si4713", sizeof(v->driver));
71
+ strscpy(v->card, "Si4713 FM Transmitter", sizeof(v->card));
7272 usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info));
73
- v->device_caps = V4L2_CAP_MODULATOR | V4L2_CAP_RDS_OUTPUT;
74
- v->capabilities = v->device_caps | V4L2_CAP_DEVICE_CAPS;
75
-
7673 return 0;
7774 }
7875
....@@ -417,7 +414,7 @@
417414 struct si4713_usb_device *radio;
418415 struct i2c_adapter *adapter;
419416 struct v4l2_subdev *sd;
420
- int retval = -ENOMEM;
417
+ int retval;
421418
422419 dev_info(&intf->dev, "Si4713 development board discovered: (%04X:%04X)\n",
423420 id->idVendor, id->idProduct);
....@@ -467,7 +464,7 @@
467464
468465 radio->vdev.ctrl_handler = sd->ctrl_handler;
469466 radio->v4l2_dev.release = usb_si4713_video_device_release;
470
- strlcpy(radio->vdev.name, radio->v4l2_dev.name,
467
+ strscpy(radio->vdev.name, radio->v4l2_dev.name,
471468 sizeof(radio->vdev.name));
472469 radio->vdev.v4l2_dev = &radio->v4l2_dev;
473470 radio->vdev.fops = &usb_si4713_fops;
....@@ -475,6 +472,7 @@
475472 radio->vdev.lock = &radio->lock;
476473 radio->vdev.release = video_device_release_empty;
477474 radio->vdev.vfl_dir = VFL_DIR_TX;
475
+ radio->vdev.device_caps = V4L2_CAP_MODULATOR | V4L2_CAP_RDS_OUTPUT;
478476
479477 video_set_drvdata(&radio->vdev, radio);
480478