1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index fb434b5602a3..5d363be7bc73 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -1034,6 +1034,11 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
                 info("%s: iface=%d. endpoint=$%02x paletteBits=$%08lx",
                      __FUNCTION__, uvd->iface, uvd->video_endp, uvd->paletteBits);
         }
+        if (uvd->dev == NULL) {
+                err("%s: uvd->dev == NULL", __FUNCTION__);
+                return -EINVAL;
+        }
+        uvd->vdev.dev=&(uvd->dev->dev);
         if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
                 err("%s: video_register_device failed", __FUNCTION__);
                 return -EPIPE;
@@ -1041,10 +1046,6 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
         if (uvd->debug > 1) {
                 info("%s: video_register_device() successful", __FUNCTION__);
         }
-        if (uvd->dev == NULL) {
-                err("%s: uvd->dev == NULL", __FUNCTION__);
-                return -EINVAL;
-        }
 
         info("%s on /dev/video%d: canvas=%s videosize=%s",
              (uvd->handle != NULL) ? uvd->handle->drvName : "???",