| From a11e7b247ebc736e8788da3e5f22203d5edce9e3 Mon Sep 17 00:00:00 2001 |
| From: Sakari Ailus <sakari.ailus@linux.intel.com> |
| Date: Mon, 2 Jan 2017 08:32:47 -0200 |
| Subject: [PATCH] media: Properly pass through media entity types in entity |
| enumeration |
| |
| commit 98d85f3cb912fde14593ead54dea4c1a00b3966f upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c |
| index 1795abeda658..8fda02a5e35b 100644 |
| --- a/drivers/media/media-device.c |
| +++ b/drivers/media/media-device.c |
| @@ -137,7 +137,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)) |
| u_ent.type = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN; |
| else if (ent->function != MEDIA_ENT_F_IO_V4L) |
| -- |
| 2.12.0 |
| |
