1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index b5aaaac427ad..0a30dbf3d05c 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -872,8 +872,8 @@ int __video_register_device(struct video_device *vdev, int type, int nr,
 
         /* Should not happen since we thought this minor was free */
         WARN_ON(video_device[vdev->minor] != NULL);
-        video_device[vdev->minor] = vdev;
         vdev->index = get_index(vdev);
+        video_device[vdev->minor] = vdev;
         mutex_unlock(&videodev_lock);
 
         if (vdev->ioctl_ops)