]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
[media] media: Determine early whether an IOCTL is supported
authorSakari Ailus <sakari.ailus@linux.intel.com>
Wed, 27 Apr 2016 12:39:17 +0000 (09:39 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Thu, 22 Sep 2016 13:22:15 +0000 (10:22 -0300)
Preparation for refactoring media IOCTL handling to unify common parts.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/media-device.c

index 1795abeda658feb543ec0a1914a6ec10e3709823..f3212640858b0db33b625489189071172c208d69 100644 (file)
@@ -419,6 +419,22 @@ static long media_device_get_topology(struct media_device *mdev,
        return 0;
 }
 
+#define MEDIA_IOC(__cmd) \
+       [_IOC_NR(MEDIA_IOC_##__cmd)] = { .cmd = MEDIA_IOC_##__cmd }
+
+/* the table is indexed by _IOC_NR(cmd) */
+struct media_ioctl_info {
+       unsigned int cmd;
+};
+
+static const struct media_ioctl_info ioctl_info[] = {
+       MEDIA_IOC(DEVICE_INFO),
+       MEDIA_IOC(ENUM_ENTITIES),
+       MEDIA_IOC(ENUM_LINKS),
+       MEDIA_IOC(SETUP_LINK),
+       MEDIA_IOC(G_TOPOLOGY),
+};
+
 static long media_device_ioctl(struct file *filp, unsigned int cmd,
                               unsigned long arg)
 {
@@ -426,6 +442,10 @@ static long media_device_ioctl(struct file *filp, unsigned int cmd,
        struct media_device *dev = devnode->media_dev;
        long ret;
 
+       if (_IOC_NR(cmd) >= ARRAY_SIZE(ioctl_info)
+           || ioctl_info[_IOC_NR(cmd)].cmd != cmd)
+               return -ENOIOCTLCMD;
+
        mutex_lock(&dev->graph_mutex);
        switch (cmd) {
        case MEDIA_IOC_DEVICE_INFO: