projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fc091ce
)
usb: gadget: f_fs: fix aio support
author
Marek Szyprowski
<m.szyprowski@samsung.com>
Wed, 4 Jun 2014 12:54:03 +0000
(14:54 +0200)
committer
Chanho Park
<chanho61.park@samsung.com>
Thu, 7 Aug 2014 05:32:05 +0000
(14:32 +0900)
Fix incompatible function signature caused by mainline backport
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-id: I7913fd834366aa23fc9261c4d5548c03fa8085ec
drivers/usb/gadget/f_fs.c
patch
|
blob
|
history
diff --git
a/drivers/usb/gadget/f_fs.c
b/drivers/usb/gadget/f_fs.c
index
94a8888
..
94ee653
100644
(file)
--- 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;