diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-06-04 14:54:03 +0200 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-06-11 11:02:19 +0200 |
| commit | 530436e92909ba2186efd2fb17d574157174f178 (patch) | |
| tree | 7286392d1cdda11d2c6de5b57d703fa6478b0f85 | |
| parent | 1e72fc508bb2a7083417894f6b6c27ee6ae943b8 (diff) | |
| download | linux-3.10-530436e92909ba2186efd2fb17d574157174f178.tar.gz linux-3.10-530436e92909ba2186efd2fb17d574157174f178.tar.bz2 linux-3.10-530436e92909ba2186efd2fb17d574157174f178.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
| -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 ffc41e4bf65..d1de11b7fb5 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; |