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 branch 'for-david' of git://git.open-mesh.org/ecsv/linux-merge
[pandora-kernel.git]
/
drivers
/
media
/
video
/
vino.c
diff --git
a/drivers/media/video/vino.c
b/drivers/media/video/vino.c
index
7e7eec4
..
d63e9d9
100644
(file)
--- a/
drivers/media/video/vino.c
+++ b/
drivers/media/video/vino.c
@@
-2954,9
+2954,6
@@
static int vino_enum_input(struct file *file, void *__fh,
if (input == VINO_INPUT_NONE)
return -EINVAL;
- memset(i, 0, sizeof(struct v4l2_input));
-
- i->index = index;
i->type = V4L2_INPUT_TYPE_CAMERA;
i->std = vino_inputs[input].std;
strcpy(i->name, vino_inputs[input].name);