summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorRakesh Bodla <rbodla@nvidia.com>2014-05-12 12:01:29 +0530
committerRiham Haidar <rhaidar@nvidia.com>2014-05-14 14:05:47 -0700
commit1df92ded1131c9c25d49ad2fd01a1583c350757f (patch)
tree768f98b7c709ac07580f2b04523db0b08961fc54 /drivers/usb
parentdfc98274759500dffa41d90b08c5019630612812 (diff)
usb: gadget: add compat_ioctl handler
Add compat_ioctl for accessory and fs to work on 64 bit platforms. Bug 1505458 Change-Id: Ic5fa65451fa6428d50de2307136a59b13bd691cb Signed-off-by: Rakesh Bodla <rbodla@nvidia.com> Reviewed-on: http://git-master/r/408014 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/f_accessory.c5
-rw-r--r--drivers/usb/gadget/f_fs.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_accessory.c b/drivers/usb/gadget/f_accessory.c
index f643146acb22..2ee3e4f18364 100644
--- a/drivers/usb/gadget/f_accessory.c
+++ b/drivers/usb/gadget/f_accessory.c
@@ -2,6 +2,8 @@
* Gadget Function Driver for Android USB accessories
*
* Copyright (C) 2011 Google, Inc.
+ * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ *
* Author: Mike Lockwood <lockwood@android.com>
*
* This software is licensed under the terms of the GNU General Public
@@ -756,6 +758,9 @@ static const struct file_operations acc_fops = {
.read = acc_read,
.write = acc_write,
.unlocked_ioctl = acc_ioctl,
+#ifdef CONFIG_COMPAT
+ .compat_ioctl = acc_ioctl,
+#endif
.open = acc_open,
.release = acc_release,
};
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index bf7d627b9454..c84b34a839e7 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -2,6 +2,8 @@
* f_fs.c -- user mode file system API for USB composite function controllers
*
* Copyright (C) 2010 Samsung Electronics
+ * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ *
* Author: Michal Nazarewicz <mina86@mina86.com>
*
* Based on inode.c (GadgetFS) which was:
@@ -734,6 +736,9 @@ static const struct file_operations ffs_ep0_operations = {
.read = ffs_ep0_read,
.release = ffs_ep0_release,
.unlocked_ioctl = ffs_ep0_ioctl,
+#ifdef CONFIG_COMPAT
+ .compat_ioctl = ffs_ep0_ioctl,
+#endif
};
@@ -953,6 +958,9 @@ static const struct file_operations ffs_epfile_operations = {
.read = ffs_epfile_read,
.release = ffs_epfile_release,
.unlocked_ioctl = ffs_epfile_ioctl,
+#ifdef CONFIG_COMPAT
+ .compat_ioctl = ffs_epfile_ioctl,
+#endif
};