diff --git a/[refs] b/[refs]
index b53abdc9cb9b..54823a3a1587 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef0e3c26efe9c52de62b96fdad94de3ed70489d0
+refs/heads/master: ee7aa9f821b27674f36fc09413914b68f7ad97ca
diff --git a/trunk/drivers/media/video/v4l2-dev.c b/trunk/drivers/media/video/v4l2-dev.c
index 6b9f3cb0de98..8903e41628eb 100644
--- a/trunk/drivers/media/video/v4l2-dev.c
+++ b/trunk/drivers/media/video/v4l2-dev.c
@@ -254,6 +254,9 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
 	int ret;
 	char *name_base;
 
+	if (vfd == NULL)
+		return -EINVAL;
+
 	if (vfd == NULL)
 		return -EINVAL;