git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
v4l2-dev.c
diff --git
a/drivers/media/video/v4l2-dev.c
b/drivers/media/video/v4l2-dev.c
index
6f36006
..
155fdec
100644
(file)
--- 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;
int ret;
char *name_base;
+ if (vfd == NULL)
+ return -EINVAL;
+
switch (type) {
case VFL_TYPE_GRABBER:
base = MINOR_VFL_TYPE_GRABBER_MIN;
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);
default:
printk(KERN_ERR "%s called with unknown type: %d\n",
__func__, type);
- return -
1
;
+ return -
EINVAL
;
}
/* pick a minor number */
}
/* pick a minor number */