summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Kiener <guido@kiener-muenchen.de>2018-07-24 12:05:28 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-24 14:50:50 +0300
commit60207c8ef2a3a971567dd1207daa234aaa856faa (patch)
tree50fdb30b5a23eda7dc95d604d04a71e882d018e4
parent12dcaeb77e67c1162a2604f6b589266baec2d1ef (diff)
downloadlinux-60207c8ef2a3a971567dd1207daa234aaa856faa.tar.xz
usb: usbtmc: Add support for 32 bit compat applications
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>
-rw-r--r--drivers/usb/class/usbtmc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 1b7b2e402adb..83ffa5a14c3d 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -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,