提交 df3fccb1 编写于 作者: G Greg Kroah-Hartman

[PATCH] USB: fix omninet driver bug

I introduced this way back in 2.6.13 when adding the port lock logic.
This device talks out through different "ports" all at the same time, so
the lock logic was wrong, preventing any data from ever being sent
properly.

Thanks a lot to Bernhard Reiter <bernhard@intevation.de> for being
patient and helping with debugging this.

Cc: Bernhard Reiter <bernhard@intevation.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 815ddc99
...@@ -257,14 +257,14 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf ...@@ -257,14 +257,14 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf
return (0); return (0);
} }
spin_lock(&port->lock); spin_lock(&wport->lock);
if (port->write_urb_busy) { if (wport->write_urb_busy) {
spin_unlock(&port->lock); spin_unlock(&wport->lock);
dbg("%s - already writing", __FUNCTION__); dbg("%s - already writing", __FUNCTION__);
return 0; return 0;
} }
port->write_urb_busy = 1; wport->write_urb_busy = 1;
spin_unlock(&port->lock); spin_unlock(&wport->lock);
count = (count > OMNINET_BULKOUTSIZE) ? OMNINET_BULKOUTSIZE : count; count = (count > OMNINET_BULKOUTSIZE) ? OMNINET_BULKOUTSIZE : count;
...@@ -283,7 +283,7 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf ...@@ -283,7 +283,7 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf
wport->write_urb->dev = serial->dev; wport->write_urb->dev = serial->dev;
result = usb_submit_urb(wport->write_urb, GFP_ATOMIC); result = usb_submit_urb(wport->write_urb, GFP_ATOMIC);
if (result) { if (result) {
port->write_urb_busy = 0; wport->write_urb_busy = 0;
err("%s - failed submitting write urb, error %d", __FUNCTION__, result); err("%s - failed submitting write urb, error %d", __FUNCTION__, result);
} else } else
result = count; result = count;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册