diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-11 12:32:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-11 12:32:02 -0800 |
| commit | 95f41fb203b0780b4fb97de64f83cc932abfd33d (patch) | |
| tree | 854b56e423bd46514dd8f42a383278b8cc114563 /include/uapi | |
| parent | Merge tag 'dmaengine-fix-4.5' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | [media] media-device: map new functions into old types for legacy API (diff) | |
| download | linux-dev-95f41fb203b0780b4fb97de64f83cc932abfd33d.tar.xz linux-dev-95f41fb203b0780b4fb97de64f83cc932abfd33d.zip | |
Merge tag 'media/v4.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
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
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/media.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 625b38f65764..a8e3a8c0d85a 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -120,7 +120,7 @@ struct media_device_info { #define MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN MEDIA_ENT_F_OLD_SUBDEV_BASE -#ifndef __KERNEL__ +#if !defined(__KERNEL__) || defined(__NEED_MEDIA_LEGACY_API) /* * Legacy symbols used to avoid userspace compilation breakages @@ -133,6 +133,10 @@ struct media_device_info { #define MEDIA_ENT_TYPE_MASK 0x00ff0000 #define MEDIA_ENT_SUBTYPE_MASK 0x0000ffff +/* End of the old subdev reserved numberspace */ +#define MEDIA_ENT_T_DEVNODE_UNKNOWN (MEDIA_ENT_T_DEVNODE | \ + MEDIA_ENT_SUBTYPE_MASK) + #define MEDIA_ENT_T_DEVNODE MEDIA_ENT_F_OLD_BASE #define MEDIA_ENT_T_DEVNODE_V4L MEDIA_ENT_F_IO_V4L #define MEDIA_ENT_T_DEVNODE_FB (MEDIA_ENT_T_DEVNODE + 2) |