Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4088acf1 authored by Rui Miguel Silva's avatar Rui Miguel Silva Committed by Felipe Balbi
Browse files

usb: gadget: f_fs: do not set cancel function on synchronous {read,write} 



do not try to set cancel function in synchronous operations in
ffs_epfile_{read,write}_iter.

Cc: <stable@vger.kernel.org> # v4.0+
Acked-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: default avatarRui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 8515bac0

drivers/usb/gadget/function/f_fs.c

+4 −2
Original line number Diff line number Diff line
@@ -924,6 +924,7 @@ static ssize_t ffs_epfile_write_iter(struct kiocb *kiocb, struct iov_iter *from) 


	kiocb->private = p;



	if (p->aio)

		kiocb_set_cancel_fn(kiocb, ffs_aio_cancel);



	res = ffs_epfile_io(kiocb->ki_filp, p);
@@ -968,6 +969,7 @@ static ssize_t ffs_epfile_read_iter(struct kiocb *kiocb, struct iov_iter *to) 


	kiocb->private = p;



	if (p->aio)

		kiocb_set_cancel_fn(kiocb, ffs_aio_cancel);



	res = ffs_epfile_io(kiocb->ki_filp, p);