diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-12-29 12:29:55 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-30 05:02:29 -0500 |
commit | 657f2271050beabe725ba101c1d840f51a41f33d (patch) | |
tree | 740e898564868e8900ed3b61fc6d57b44e114b57 /drivers/media/video/cx18 | |
parent | 3ea2b673a55cee528f83653e711d09425ed4d8b6 (diff) |
[media] v4l: fix handling of v4l2_input.capabilities
The v4l core sets the v4l2_input.capabilities field based on the supplied
v4l2_ioctl_ops. However, several drivers do a memset or memcpy of the v4l2_input
struct, thus overwriting that field incorrectly.
Either remove the memset (which is already done by the v4l core), or add the
proper capabilities field in case of a memcpy.
The same is also true for v4l2_output, but that only affected the ivtv driver.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r-- | drivers/media/video/cx18/cx18-cards.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c index 52ba913b5af8..87177733cf92 100644 --- a/drivers/media/video/cx18/cx18-cards.c +++ b/drivers/media/video/cx18/cx18-cards.c | |||
@@ -546,7 +546,6 @@ int cx18_get_input(struct cx18 *cx, u16 index, struct v4l2_input *input) | |||
546 | "Component 1" | 546 | "Component 1" |
547 | }; | 547 | }; |
548 | 548 | ||
549 | memset(input, 0, sizeof(*input)); | ||
550 | if (index >= cx->nof_inputs) | 549 | if (index >= cx->nof_inputs) |
551 | return -EINVAL; | 550 | return -EINVAL; |
552 | input->index = index; | 551 | input->index = index; |