Pull media fix from Mauro Carvalho Chehab: "One last time fix: It adds a code that prevents some media tools like media-ctl to hide some entities that have their IDs out of the range expected by those apps" * tag 'media/v4.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: [media] media-device: map new functions into old types for legacy API
Showing the changes to include/uapi/linux (1 of 2 files). Show all
Unified · Split
| @@ -120,7 +120,7 @@ struct media_device_info { · 119 unmodified lines | ||
| 120 | 120 | |
| 121 | 121 | #define MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN MEDIA_ENT_F_OLD_SUBDEV_BASE |
| 122 | 122 | |
| 123 | −#ifndef __KERNEL__ | |
| 123 | +#if !defined(__KERNEL__) || defined(__NEED_MEDIA_LEGACY_API) | |
| 124 | 124 | |
| 125 | 125 | /* |
| 126 | 126 | * Legacy symbols used to avoid userspace compilation breakages |
| @@ -133,6 +133,10 @@ struct media_device_info { · 6 unmodified lines | ||
| 133 | 133 | #define MEDIA_ENT_TYPE_MASK 0x00ff0000 |
| 134 | 134 | #define MEDIA_ENT_SUBTYPE_MASK 0x0000ffff |
| 135 | 135 | |
| 136 | +/* End of the old subdev reserved numberspace */ | |
| 137 | +#define MEDIA_ENT_T_DEVNODE_UNKNOWN (MEDIA_ENT_T_DEVNODE | \ | |
| 138 | + MEDIA_ENT_SUBTYPE_MASK) | |
| 139 | + | |
| 136 | 140 | #define MEDIA_ENT_T_DEVNODE MEDIA_ENT_F_OLD_BASE |
| 137 | 141 | #define MEDIA_ENT_T_DEVNODE_V4L MEDIA_ENT_F_IO_V4L |
| 138 | 142 | #define MEDIA_ENT_T_DEVNODE_FB (MEDIA_ENT_T_DEVNODE + 2) |