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/staging | |
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/staging')
-rw-r--r-- | drivers/staging/cx25821/cx25821-video.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c index 27406c31d87..998c33acf7b 100644 --- a/drivers/staging/cx25821/cx25821-video.c +++ b/drivers/staging/cx25821/cx25821-video.c | |||
@@ -1272,8 +1272,6 @@ int cx25821_enum_input(struct cx25821_dev *dev, struct v4l2_input *i) | |||
1272 | if (0 == INPUT(n)->type) | 1272 | if (0 == INPUT(n)->type) |
1273 | return -EINVAL; | 1273 | return -EINVAL; |
1274 | 1274 | ||
1275 | memset(i, 0, sizeof(*i)); | ||
1276 | i->index = n; | ||
1277 | i->type = V4L2_INPUT_TYPE_CAMERA; | 1275 | i->type = V4L2_INPUT_TYPE_CAMERA; |
1278 | strcpy(i->name, iname[INPUT(n)->type]); | 1276 | strcpy(i->name, iname[INPUT(n)->type]); |
1279 | 1277 | ||