Commit 474966ee01cc877e28abed3ada5b48a963c58695
Committed by
Mauro Carvalho Chehab
1 parent
4b0ec19e02
Exists in
master
and in
39 other branches
[media] media: Pick a free ioctls range
Pick an unused range of ioctls in Documentation/ioctl/ioctl-number.txt and use it for the MEDIA_IOC_* ioctls. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Showing 2 changed files with 5 additions and 4 deletions Side-by-side Diff
Documentation/ioctl/ioctl-number.txt
... | ... | @@ -272,6 +272,7 @@ |
272 | 272 | 'z' 40-7F CAN bus card conflict! |
273 | 273 | <mailto:oe@port.de> |
274 | 274 | 'z' 10-4F drivers/s390/crypto/zcrypt_api.h conflict! |
275 | +'|' 00-7F linux/media.h | |
275 | 276 | 0x80 00-1F linux/fb.h |
276 | 277 | 0x89 00-06 arch/x86/include/asm/sockios.h |
277 | 278 | 0x89 0B-DF linux/sockios.h |
include/linux/media.h
... | ... | @@ -124,10 +124,10 @@ |
124 | 124 | __u32 reserved[4]; |
125 | 125 | }; |
126 | 126 | |
127 | -#define MEDIA_IOC_DEVICE_INFO _IOWR('M', 1, struct media_device_info) | |
128 | -#define MEDIA_IOC_ENUM_ENTITIES _IOWR('M', 2, struct media_entity_desc) | |
129 | -#define MEDIA_IOC_ENUM_LINKS _IOWR('M', 3, struct media_links_enum) | |
130 | -#define MEDIA_IOC_SETUP_LINK _IOWR('M', 4, struct media_link_desc) | |
127 | +#define MEDIA_IOC_DEVICE_INFO _IOWR('|', 0x00, struct media_device_info) | |
128 | +#define MEDIA_IOC_ENUM_ENTITIES _IOWR('|', 0x01, struct media_entity_desc) | |
129 | +#define MEDIA_IOC_ENUM_LINKS _IOWR('|', 0x02, struct media_links_enum) | |
130 | +#define MEDIA_IOC_SETUP_LINK _IOWR('|', 0x03, struct media_link_desc) | |
131 | 131 | |
132 | 132 | #endif /* __LINUX_MEDIA_H */ |