Merge tag 'usb-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb...

[cascardo/linux.git] / drivers / usb / gadget / function / f_fs.c

diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 15b648c..73515d5 100644 (file)
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -651,7 +651,7 @@ static void ffs_user_copy_worker(struct work_struct *work)
        if (io_data->read && ret > 0) {
                use_mm(io_data->mm);
                ret = copy_to_iter(io_data->buf, ret, &io_data->data);
-               if (iov_iter_count(&io_data->data))
+               if (ret != io_data->req->actual && iov_iter_count(&io_data->data))
                        ret = -EFAULT;
                unuse_mm(io_data->mm);
        }