diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-06-04 14:54:03 +0200 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:59:43 +0900 |
| commit | b9fa721bc6c0e386a306f51a913505a5617e9eee (patch) | |
| tree | 79c137de92a77a893b47de78094610853ff4bd15 /drivers/usb | |
| parent | 14ae9f2d3bd60f2519afad885cf34d803e8dc910 (diff) | |
| download | linux-3.10-b9fa721bc6c0e386a306f51a913505a5617e9eee.tar.gz linux-3.10-b9fa721bc6c0e386a306f51a913505a5617e9eee.tar.bz2 linux-3.10-b9fa721bc6c0e386a306f51a913505a5617e9eee.zip | |
usb: gadget: f_fs: fix aio support
Fix incompatible function signature caused by mainline backport
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-id: I7913fd834366aa23fc9261c4d5548c03fa8085ec
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/f_fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index 94a888826b7..94ee6539bf9 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c @@ -915,7 +915,7 @@ ffs_epfile_open(struct inode *inode, struct file *file) return 0; } -static int ffs_aio_cancel(struct kiocb *kiocb) +static int ffs_aio_cancel(struct kiocb *kiocb, struct io_event *e) { struct ffs_io_data *io_data = kiocb->private; struct ffs_epfile *epfile = kiocb->ki_filp->private_data; |