diff options
| author | Huang Shijie <b32955@freescale.com> | 2011-09-14 17:34:54 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 20:23:56 +0800 |
| commit | ef749cdf4676c37807bff77088063ae761ae8693 (patch) | |
| tree | fe802818f78d1dfb3ea980abfbf1d3a84231caa6 | |
| parent | 09d51bc5c8c078f434337c456fe6258a8d3f2f2b (diff) | |
ENGR00139279 MX6Q: support the MFGTOOL
fix ioctls.
Signed-off-by: Huang Shijie <b32955@freescale.com>
| -rw-r--r-- | drivers/usb/gadget/fsl_updater.c | 4 | ||||
| -rw-r--r-- | drivers/usb/gadget/fsl_updater.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/fsl_updater.c b/drivers/usb/gadget/fsl_updater.c index e0705b8d9c66..1bfe790b687f 100644 --- a/drivers/usb/gadget/fsl_updater.c +++ b/drivers/usb/gadget/fsl_updater.c @@ -139,8 +139,8 @@ static ssize_t utp_file_write(struct file *file, const char __user *buf, return size; } -static int -utp_ioctl(struct inode *inode, struct file *file, +static long +utp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { int cpu_id = 0; diff --git a/drivers/usb/gadget/fsl_updater.h b/drivers/usb/gadget/fsl_updater.h index 9c276a8f3a92..e2cac2de1453 100644 --- a/drivers/usb/gadget/fsl_updater.h +++ b/drivers/usb/gadget/fsl_updater.h @@ -35,7 +35,7 @@ static ssize_t utp_file_write(struct file *file, size_t size, loff_t *off); -static int utp_ioctl(struct inode *inode, struct file *file, +static long utp_ioctl(struct file *file, unsigned int cmd, unsigned long arg); static struct utp_user_data *utp_user_data_alloc(size_t size); static void utp_user_data_free(struct utp_user_data *uud); @@ -105,7 +105,7 @@ static const struct file_operations utp_fops = { .open = nonseekable_open, .read = utp_file_read, .write = utp_file_write, - .ioctl = utp_ioctl, + .unlocked_ioctl = utp_ioctl, }; static struct miscdevice utp_dev = { |