1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 6f36006aecda..155fdec9ac7d 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -257,6 +257,9 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
         int ret;
         char *name_base;
 
+        if (vfd == NULL)
+                return -EINVAL;
+
         switch (type) {
         case VFL_TYPE_GRABBER:
                 base = MINOR_VFL_TYPE_GRABBER_MIN;
@@ -281,7 +284,7 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
         default:
                 printk(KERN_ERR "%s called with unknown type: %d\n",
                        __func__, type);
-                return -1;
+                return -EINVAL;
         }
 
         /* pick a minor number */