diff options
| author | Johan Hovold <jhovold@gmail.com> | 2011-11-06 19:06:35 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-15 19:43:30 +0100 |
| commit | d4691c3fa3d371835b1eacb39066ab113c4b9d8c (patch) | |
| tree | 19a1ed1b781a337d703444363787615e23930c06 | |
| parent | USB: pl2303: return errors from usb_submit_urb in open (diff) | |
| download | linux-d4691c3fa3d371835b1eacb39066ab113c4b9d8c.tar.xz linux-d4691c3fa3d371835b1eacb39066ab113c4b9d8c.zip | |
USB: pl2302: clean up error handling in open
Reorder urb submission and simply kill interrupt urb should read-urb
submission fail (rather than calling close).
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/serial/pl2303.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 506d1e930c3e..9fdc944ff48d 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c @@ -503,21 +503,20 @@ static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port) if (tty) pl2303_set_termios(tty, port, &tmp_termios); - dbg("%s - submitting read urb", __func__); - result = usb_serial_generic_submit_read_urb(port, GFP_KERNEL); - if (result) { - pl2303_close(port); - return result; - } - dbg("%s - submitting interrupt urb", __func__); result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); if (result) { dev_err(&port->dev, "%s - failed submitting interrupt urb," " error %d\n", __func__, result); - pl2303_close(port); return result; } + + result = usb_serial_generic_submit_read_urb(port, GFP_KERNEL); + if (result) { + usb_kill_urb(port->interrupt_in_urb); + return result; + } + port->port.drain_delay = 256; return 0; } |