From 4c77b46f8376139c18bae549977fca3bb76a1f2b Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Wed, 4 Jun 2014 14:54:03 +0200 Subject: [PATCH] usb: gadget: f_fs: fix aio support Fix incompatible function signature caused by mainline backport Signed-off-by: Marek Szyprowski Change-id: I7913fd834366aa23fc9261c4d5548c03fa8085ec --- drivers/usb/gadget/f_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index 94a8888..94ee653 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; -- 2.7.4