diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-21 09:19:31 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-05-07 11:52:11 -0300 |
commit | f73696275e64d55c59947b42979b531cb026d718 (patch) | |
tree | d40e77a1febdeecdfe0bc3eef9cba11b8ad1cda2 /drivers/media | |
parent | 00303f9134c2db5d17bacda541c07d46517485d9 (diff) | |
download | linux-stable-f73696275e64d55c59947b42979b531cb026d718.tar.gz linux-stable-f73696275e64d55c59947b42979b531cb026d718.tar.bz2 linux-stable-f73696275e64d55c59947b42979b531cb026d718.zip |
[media] media-device: Simplify compat32 logic
Only MEDIA_IOC_ENUM_LINKS32 require an special logic when
userspace is 32 bits and Kernel is 64 bits.
For the rest, media_device_ioctl() will do the right thing,
and will return -ENOIOCTLCMD if the ioctl is unknown.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/media-device.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index de92a6bf3751..47a99af5525e 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -499,12 +499,6 @@ static long media_device_compat_ioctl(struct file *filp, unsigned int cmd, long ret; switch (cmd) { - case MEDIA_IOC_DEVICE_INFO: - case MEDIA_IOC_ENUM_ENTITIES: - case MEDIA_IOC_SETUP_LINK: - case MEDIA_IOC_G_TOPOLOGY: - return media_device_ioctl(filp, cmd, arg); - case MEDIA_IOC_ENUM_LINKS32: mutex_lock(&dev->graph_mutex); ret = media_device_enum_links32(dev, @@ -513,7 +507,7 @@ static long media_device_compat_ioctl(struct file *filp, unsigned int cmd, break; default: - ret = -ENOIOCTLCMD; + return media_device_ioctl(filp, cmd, arg); } return ret; |