.. | .. |
---|
67 | 67 | { |
---|
68 | 68 | struct si4713_usb_device *radio = video_drvdata(file); |
---|
69 | 69 | |
---|
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)); |
---|
72 | 72 | 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 | | - |
---|
76 | 73 | return 0; |
---|
77 | 74 | } |
---|
78 | 75 | |
---|
.. | .. |
---|
417 | 414 | struct si4713_usb_device *radio; |
---|
418 | 415 | struct i2c_adapter *adapter; |
---|
419 | 416 | struct v4l2_subdev *sd; |
---|
420 | | - int retval = -ENOMEM; |
---|
| 417 | + int retval; |
---|
421 | 418 | |
---|
422 | 419 | dev_info(&intf->dev, "Si4713 development board discovered: (%04X:%04X)\n", |
---|
423 | 420 | id->idVendor, id->idProduct); |
---|
.. | .. |
---|
467 | 464 | |
---|
468 | 465 | radio->vdev.ctrl_handler = sd->ctrl_handler; |
---|
469 | 466 | 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, |
---|
471 | 468 | sizeof(radio->vdev.name)); |
---|
472 | 469 | radio->vdev.v4l2_dev = &radio->v4l2_dev; |
---|
473 | 470 | radio->vdev.fops = &usb_si4713_fops; |
---|
.. | .. |
---|
475 | 472 | radio->vdev.lock = &radio->lock; |
---|
476 | 473 | radio->vdev.release = video_device_release_empty; |
---|
477 | 474 | radio->vdev.vfl_dir = VFL_DIR_TX; |
---|
| 475 | + radio->vdev.device_caps = V4L2_CAP_MODULATOR | V4L2_CAP_RDS_OUTPUT; |
---|
478 | 476 | |
---|
479 | 477 | video_set_drvdata(&radio->vdev, radio); |
---|
480 | 478 | |
---|