Commit 10e48522 authored by Pete Zaitcev's avatar Pete Zaitcev Committed by Greg Kroah-Hartman

USB: usblp: "Big cleanup" breaks O_NONBLOCK

I found the first regresson in the rewritten ("all dynamic" and "no races")
driver. If application uses O_NONBLOCK, I return -EAGAIN despite the URB
being submitted successfuly. This causes the application to resubmit the
same data erroneously.

The fix is to pretend that the transfer has succeeded even if URB was
merely queued. It is the same behaviour as with the old version.
Signed-off-by: default avatarPete Zaitcev <zaitcev@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9454c46a
...@@ -741,10 +741,11 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t ...@@ -741,10 +741,11 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
*/ */
rv = usblp_wwait(usblp, !!(file->f_flags&O_NONBLOCK)); rv = usblp_wwait(usblp, !!(file->f_flags&O_NONBLOCK));
if (rv < 0) { if (rv < 0) {
/* if (rv == -EAGAIN) {
* If interrupted, we simply leave the URB to dangle, /* Presume that it's going to complete well. */
* so the ->release will call usb_kill_urb(). writecount += transfer_length;
*/ }
/* Leave URB dangling, to be cleaned on close. */
goto collect_error; goto collect_error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment