]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
usb: usbtmc: Add support for 32 bit compat applications
authorGuido Kiener <guido@kiener-muenchen.de>
Tue, 24 Jul 2018 09:05:28 +0000 (11:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Jul 2018 11:50:50 +0000 (13:50 +0200)
32 bit applications can only call ioctl functions on 64 bit systems
when the field .compat_ioctl is defined for file operations.

Tested-by: Dave Penkler <dpenkler@gmail.com>
Signed-off-by: Guido Kiener <guido.kiener@rohde-schwarz.com>
Reviewed-by: Steve Bayless <steve_bayless@keysight.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/class/usbtmc.c

index 1b7b2e402adb07dfc9cbf45071958a533c8fcd53..83ffa5a14c3dbbc53e8b964a4101e6e4a19c57a5 100644 (file)
@@ -18,6 +18,7 @@
 #include <linux/poll.h>
 #include <linux/mutex.h>
 #include <linux/usb.h>
+#include <linux/compat.h>
 #include <linux/usb/tmc.h>
 
 
@@ -1459,6 +1460,9 @@ static const struct file_operations fops = {
        .open           = usbtmc_open,
        .release        = usbtmc_release,
        .unlocked_ioctl = usbtmc_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = usbtmc_ioctl,
+#endif
        .fasync         = usbtmc_fasync,
        .poll           = usbtmc_poll,
        .llseek         = default_llseek,