Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw

[~andy/linux] / drivers / media / media-devnode.c

diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c
index 023b2a1cbb9b73ba6829f387f28e85f9f3f72e91..fb0f0469fad7c015f2d27d0811c0c1d0bfc26951 100644 (file)
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -116,19 +116,41 @@ static unsigned int media_poll(struct file *filp,
        return mdev->fops->poll(filp, poll);
 }
 
-static long media_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+static long
+__media_ioctl(struct file *filp, unsigned int cmd, unsigned long arg,
+             long (*ioctl_func)(struct file *filp, unsigned int cmd,
+                                unsigned long arg))
 {
        struct media_devnode *mdev = media_devnode_data(filp);
 
-       if (!mdev->fops->ioctl)
+       if (!ioctl_func)
                return -ENOTTY;
 
        if (!media_devnode_is_registered(mdev))
                return -EIO;
 
-       return mdev->fops->ioctl(filp, cmd, arg);
+       return ioctl_func(filp, cmd, arg);
+}
+
+static long media_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+       struct media_devnode *mdev = media_devnode_data(filp);
+
+       return __media_ioctl(filp, cmd, arg, mdev->fops->ioctl);
 }
 
+#ifdef CONFIG_COMPAT
+
+static long media_compat_ioctl(struct file *filp, unsigned int cmd,
+                              unsigned long arg)
+{
+       struct media_devnode *mdev = media_devnode_data(filp);
+
+       return __media_ioctl(filp, cmd, arg, mdev->fops->compat_ioctl);
+}
+
+#endif /* CONFIG_COMPAT */
+
 /* Override for the open function */
 static int media_open(struct inode *inode, struct file *filp)
 {
@@ -188,6 +210,9 @@ static const struct file_operations media_devnode_fops = {
        .write = media_write,
        .open = media_open,
        .unlocked_ioctl = media_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl = media_compat_ioctl,
+#endif /* CONFIG_COMPAT */
        .release = media_release,
        .poll = media_poll,
        .llseek = no_llseek,