Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / vino.c

diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 7e7eec48f8b12bd305a6f92539ba650ec727f9f2..d63e9d97849339c069e3820298384b1c49be9cb8 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);