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>
This commit is contained in:
parent
db6e9186c9
commit
d4691c3fa3
1 changed files with 7 additions and 8 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue