Merge branch 'linus' into sched/urgent

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 = {
         .llseek = no_llseek,
 };
 static const struct video_device usbvideo_template = {
-        .owner =      THIS_MODULE,
-        .type =       VID_TYPE_CAPTURE,
         .fops =       &usbvideo_fops,
 };
 
@@ -1040,7 +1038,7 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
                 err("%s: uvd->dev == NULL", __func__);
                 return -EINVAL;
         }
-        uvd->vdev.dev = &uvd->dev->dev;
+        uvd->vdev.parent = &uvd->dev->dev;
         if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
                 err("%s: video_register_device failed", __func__);
                 return -EPIPE;