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: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pete Zaitcev 2007-07-10 20:09:58 -07:00 committed by Greg Kroah-Hartman
parent 9454c46a89
commit 10e485221e

View file

@ -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;
} }