diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/usb/serial/io_edgeport.c | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'drivers/usb/serial/io_edgeport.c')
| -rw-r--r-- | drivers/usb/serial/io_edgeport.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index 91bd3014ef1e..d06547a13f28 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
| @@ -1038,9 +1038,7 @@ static void edge_close (struct usb_serial_port *port, struct file * filp) | |||
| 1038 | edge_port->open = FALSE; | 1038 | edge_port->open = FALSE; |
| 1039 | edge_port->openPending = FALSE; | 1039 | edge_port->openPending = FALSE; |
| 1040 | 1040 | ||
| 1041 | if (edge_port->write_urb) { | 1041 | usb_kill_urb(edge_port->write_urb); |
| 1042 | usb_kill_urb(edge_port->write_urb); | ||
| 1043 | } | ||
| 1044 | 1042 | ||
| 1045 | if (edge_port->write_urb) { | 1043 | if (edge_port->write_urb) { |
| 1046 | /* if this urb had a transfer buffer already (old transfer) free it */ | 1044 | /* if this urb had a transfer buffer already (old transfer) free it */ |