lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] media: fix truncated entity specification

Browse Source 
When enumerating an entity, assign the entire entity specification
instead of only the first two words. (This requires giving the
specification union a name.)

So far, no driver actually uses more than two words, but this will
be needed for ALSA entities.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
[laurent.pinchart@ideasonboard.com: Rename specification to info]
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Clemens Ladisch
2011-11-05 18:42:01 -03:00
committed by Mauro Carvalho Chehab
parent c1026c580d
commit fa5034c667
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/media-device.c
View File

@@ -108,8 +108,7 @@ static long media_device_enum_entities(struct media_device *mdev,
u_ent.group_id = ent->group_id; u_ent.group_id = ent->group_id;
u_ent.pads = ent->num_pads; u_ent.pads = ent->num_pads;
u_ent.links = ent->num_links - ent->num_backlinks; u_ent.links = ent->num_links - ent->num_backlinks;
u_ent.v4l.major = ent->v4l.major; memcpy(&u_ent.raw, &ent->info, sizeof(ent->info));
u_ent.v4l.minor = ent->v4l.minor;
if (copy_to_user(uent, &u_ent, sizeof(u_ent))) if (copy_to_user(uent, &u_ent, sizeof(u_ent)))
return -EFAULT; return -EFAULT;
return 0; return 0;

4
drivers/media/video/v4l2-dev.c
View File

@@ -701,8 +701,8 @@ int __video_register_device(struct video_device *vdev, int type, int nr,
vdev->vfl_type != VFL_TYPE_SUBDEV) { vdev->vfl_type != VFL_TYPE_SUBDEV) {
vdev->entity.type = MEDIA_ENT_T_DEVNODE_V4L; vdev->entity.type = MEDIA_ENT_T_DEVNODE_V4L;
vdev->entity.name = vdev->name; vdev->entity.name = vdev->name;
vdev->entity.v4l.major = VIDEO_MAJOR; vdev->entity.info.v4l.major = VIDEO_MAJOR;
vdev->entity.v4l.minor = vdev->minor; vdev->entity.info.v4l.minor = vdev->minor;
ret = media_device_register_entity(vdev->v4l2_dev->mdev, ret = media_device_register_entity(vdev->v4l2_dev->mdev,
&vdev->entity); &vdev->entity);
if (ret < 0) if (ret < 0)

4
drivers/media/video/v4l2-device.c
View File

@@ -234,8 +234,8 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)
goto clean_up; goto clean_up;
} }
#if defined(CONFIG_MEDIA_CONTROLLER) #if defined(CONFIG_MEDIA_CONTROLLER)
sd->entity.v4l.major = VIDEO_MAJOR; sd->entity.info.v4l.major = VIDEO_MAJOR;
sd->entity.v4l.minor = vdev->minor; sd->entity.info.v4l.minor = vdev->minor;
#endif #endif
sd->devnode = vdev; sd->devnode = vdev;
} }

2
include/media/media-entity.h
View File

@@ -98,7 +98,7 @@ struct media_entity {
/* Sub-device specifications */ /* Sub-device specifications */
/* Nothing needed yet */ /* Nothing needed yet */
}; } info;
}; };
static inline u32 media_entity_type(struct media_entity *entity) static inline u32 media_entity_type(struct media_entity *entity)