]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
[media] media-device: Simplify compat32 logic
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 21 Mar 2016 12:19:31 +0000 (09:19 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Sat, 7 May 2016 14:52:11 +0000 (11:52 -0300)
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>
drivers/media/media-device.c

index de92a6bf3751240447b5929eeba5a96fed1b0af0..47a99af5525e94758846403f1980f8bd3aeb4d78 100644 (file)
@@ -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;