| Message ID | 20200713105517.27796-2-johan@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | bcbb9d812eead97e1fc01b223c0c5586a4ff08d9 |
| Headers | show |
| Series | USB: serial: cp210x: add support for line-status events | expand |
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index a90801ef0055..c01c7863dd1a 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -824,7 +824,16 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port) if (tty) cp210x_change_speed(tty, port, NULL); - return usb_serial_generic_open(tty, port); + result = usb_serial_generic_open(tty, port); + if (result) + goto err_disable; + + return 0; + +err_disable: + cp210x_write_u16_reg(port, CP210X_IFC_ENABLE, UART_DISABLE); + + return result; } static void cp210x_close(struct usb_serial_port *port)
Try to disable the serial interface in the unlikely event that generic open() fails. Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/usb/serial/cp210x.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)