summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
authorRohith Seelaboyina <rseelaboyina@nvidia.com>2014-02-12 10:07:00 +0530
committerRohith Seelaboyina <rseelaboyina@nvidia.com>2014-02-16 21:00:28 -0800
commit1c2be67f5efd5e526cbb3553629bb9c1d8f02730 (patch)
treed06d0466e12d30e766801b4d220ed1294016d734 /drivers/usb/gadget
parent192a39c9edf74694584f6c937eb0e0d9e64d1897 (diff)
usb: gadget: mtp: add compat_ioctl
Add compat_ioctl for mtp to work on 64 bit platforms. Bug 1432018 Change-Id: I27f7a56e8c34192fc524727d637fe6cea5c5020b Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com> Reviewed-on: http://git-master/r/366258 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Krishna Yarlagadda <kyarlagadda@nvidia.com> Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/f_mtp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/f_mtp.c
index 5d5fc856b999..dbfa6d70f37b 100644
--- a/drivers/usb/gadget/f_mtp.c
+++ b/drivers/usb/gadget/f_mtp.c
@@ -2,7 +2,7 @@
* Gadget Function Driver for MTP
*
* Copyright (C) 2010 Google, Inc.
- * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved.
*
* Author: Mike Lockwood <lockwood@android.com>
*
@@ -880,7 +880,7 @@ static int mtp_send_event(struct mtp_dev *dev, struct mtp_event *event)
return ret;
}
-static long mtp_ioctl(struct file *fp, unsigned code, unsigned long value)
+static long mtp_ioctl(struct file *fp, unsigned code, u32 value)
{
struct mtp_dev *dev = fp->private_data;
struct file *filp = NULL;
@@ -1011,6 +1011,9 @@ static const struct file_operations mtp_fops = {
.read = mtp_read,
.write = mtp_write,
.unlocked_ioctl = mtp_ioctl,
+#ifdef CONFIG_COMPAT
+ .compat_ioctl = mtp_ioctl,
+#endif
.open = mtp_open,
.release = mtp_release,
};