From 606c13ff390990a112c5b790d342b3119876fe57 Mon Sep 17 00:00:00 2001
From: Henrik Kretzschmar <henne@nachtwindheim.de>
Date: Fri, 22 Aug 2008 16:41:03 -0300
Subject: [PATCH] --- yaml --- r: 113851 b: refs/heads/master c:
 ee7aa9f821b27674f36fc09413914b68f7ad97ca h: refs/heads/master i:   113849:
 680e5bf822f077979fa8fd57ad467cc0b0424c6d   113847:
 ae3b72d2e63e5a7378b7353edc4ec48278f92437 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/media/video/v4l2-dev.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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;