diff options
Diffstat (limited to 'drivers/media/radio/dsbr100.c')
-rw-r--r-- | drivers/media/radio/dsbr100.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c index 97c6853ad1d3..08bf5e8031da 100644 --- a/drivers/media/radio/dsbr100.c +++ b/drivers/media/radio/dsbr100.c | |||
@@ -445,14 +445,7 @@ static const struct file_operations usb_dsbr100_fops = { | |||
445 | .llseek = no_llseek, | 445 | .llseek = no_llseek, |
446 | }; | 446 | }; |
447 | 447 | ||
448 | /* V4L2 interface */ | 448 | static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = { |
449 | static struct video_device dsbr100_videodev_template = | ||
450 | { | ||
451 | .owner = THIS_MODULE, | ||
452 | .name = "D-Link DSB-R 100", | ||
453 | .type = VID_TYPE_TUNER, | ||
454 | .fops = &usb_dsbr100_fops, | ||
455 | .release = video_device_release, | ||
456 | .vidioc_querycap = vidioc_querycap, | 449 | .vidioc_querycap = vidioc_querycap, |
457 | .vidioc_g_tuner = vidioc_g_tuner, | 450 | .vidioc_g_tuner = vidioc_g_tuner, |
458 | .vidioc_s_tuner = vidioc_s_tuner, | 451 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -467,6 +460,16 @@ static struct video_device dsbr100_videodev_template = | |||
467 | .vidioc_s_input = vidioc_s_input, | 460 | .vidioc_s_input = vidioc_s_input, |
468 | }; | 461 | }; |
469 | 462 | ||
463 | /* V4L2 interface */ | ||
464 | static struct video_device dsbr100_videodev_template = { | ||
465 | .owner = THIS_MODULE, | ||
466 | .name = "D-Link DSB-R 100", | ||
467 | .type = VID_TYPE_TUNER, | ||
468 | .fops = &usb_dsbr100_fops, | ||
469 | .ioctl_ops = &usb_dsbr100_ioctl_ops, | ||
470 | .release = video_device_release, | ||
471 | }; | ||
472 | |||
470 | /* check if the device is present and register with v4l and | 473 | /* check if the device is present and register with v4l and |
471 | usb if it is */ | 474 | usb if it is */ |
472 | static int usb_dsbr100_probe(struct usb_interface *intf, | 475 | static int usb_dsbr100_probe(struct usb_interface *intf, |