diff options
Diffstat (limited to 'drivers/media/video/usbvideo/usbvideo.c')
-rw-r--r-- | drivers/media/video/usbvideo/usbvideo.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c index 4128ee20b64e..bf1bc2f69b02 100644 --- a/drivers/media/video/usbvideo/usbvideo.c +++ b/drivers/media/video/usbvideo/usbvideo.c | |||
@@ -952,8 +952,6 @@ static const struct file_operations usbvideo_fops = { | |||
952 | .llseek = no_llseek, | 952 | .llseek = no_llseek, |
953 | }; | 953 | }; |
954 | static const struct video_device usbvideo_template = { | 954 | static const struct video_device usbvideo_template = { |
955 | .owner = THIS_MODULE, | ||
956 | .type = VID_TYPE_CAPTURE, | ||
957 | .fops = &usbvideo_fops, | 955 | .fops = &usbvideo_fops, |
958 | }; | 956 | }; |
959 | 957 | ||
@@ -1040,7 +1038,7 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd) | |||
1040 | err("%s: uvd->dev == NULL", __func__); | 1038 | err("%s: uvd->dev == NULL", __func__); |
1041 | return -EINVAL; | 1039 | return -EINVAL; |
1042 | } | 1040 | } |
1043 | uvd->vdev.dev = &uvd->dev->dev; | 1041 | uvd->vdev.parent = &uvd->dev->dev; |
1044 | if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) { | 1042 | if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) { |
1045 | err("%s: video_register_device failed", __func__); | 1043 | err("%s: video_register_device failed", __func__); |
1046 | return -EPIPE; | 1044 | return -EPIPE; |