diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-05-19 15:02:42 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 15:02:42 +1000 |
| commit | 3c06da5ae5358e9d325d541a053e1059e9654bcc (patch) | |
| tree | 04c953cc82fe57cff248ac523095cd4f0d9611a7 /drivers/usb/serial/omninet.c | |
| parent | 4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950 (diff) | |
| parent | a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/usb/serial/omninet.c')
| -rw-r--r-- | drivers/usb/serial/omninet.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index 4d40704dea2..238033a8709 100644 --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c @@ -257,14 +257,14 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf return (0); } - spin_lock(&port->lock); - if (port->write_urb_busy) { - spin_unlock(&port->lock); + spin_lock(&wport->lock); + if (wport->write_urb_busy) { + spin_unlock(&wport->lock); dbg("%s - already writing", __FUNCTION__); return 0; } - port->write_urb_busy = 1; - spin_unlock(&port->lock); + wport->write_urb_busy = 1; + spin_unlock(&wport->lock); count = (count > OMNINET_BULKOUTSIZE) ? OMNINET_BULKOUTSIZE : count; @@ -283,7 +283,7 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf wport->write_urb->dev = serial->dev; result = usb_submit_urb(wport->write_urb, GFP_ATOMIC); if (result) { - port->write_urb_busy = 0; + wport->write_urb_busy = 0; err("%s - failed submitting write urb, error %d", __FUNCTION__, result); } else result = count; |