diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2017-01-02 11:32:47 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-01-27 14:20:33 +0100 |
| commit | 98d85f3cb912fde14593ead54dea4c1a00b3966f (patch) | |
| tree | da286b825585810d7a510d4637d1a9276f72cea5 | |
| parent | [media] mn88473: add DVB-T2 PLP support (diff) | |
| download | linux-98d85f3cb912fde14593ead54dea4c1a00b3966f.tar.xz linux-98d85f3cb912fde14593ead54dea4c1a00b3966f.zip | |
[media] media: Properly pass through media entity types in entity enumeration
When the functions replaced media entity types, the range which was
allowed for the types was incorrect. This meant that media entity types
for specific devices were not passed correctly to the userspace through
MEDIA_IOC_ENUM_ENTITIES. Fix it.
Fixes: commit b2cd27448b33 ("[media] media-device: map new functions into old types for legacy API")
Reported-and-tested-by: Antti Laakso <antti.laakso@intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: stable@vger.kernel.org # For v4.5 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
| -rw-r--r-- | drivers/media/media-device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 8756275e9fc4..892745663765 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -130,7 +130,7 @@ static long media_device_enum_entities(struct media_device *mdev, * old range. */ if (ent->function < MEDIA_ENT_F_OLD_BASE || - ent->function > MEDIA_ENT_T_DEVNODE_UNKNOWN) { + ent->function > MEDIA_ENT_F_TUNER) { if (is_media_entity_v4l2_subdev(ent)) entd->type = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN; else if (ent->function != MEDIA_ENT_F_IO_V4L) |