Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ecb9eb8064ba705e9182772db28809a755c920e8

Authored by Johan Hovold
Committed by Greg Kroah-Hartman
1 parent 53ab34dc50
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

USB: cp210x: always disable uart on close 

Always try to disable the uart on close.

Since the switch to tty ports, close will be called as part of shutdown
before disconnect returns. Hence there is no need to check the
disconnected flag, and we can put devices in disabled states also on
driver unbind.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 5 deletions Side-by-side Diff

drivers/usb/serial/cp210x.c
Diff comments   View file @ ecb9eb8
... ... @@ -462,11 +462,7 @@
462 462 static void cp210x_close(struct usb_serial_port *port)
463 463 {
464 464 usb_serial_generic_close(port);
465   -
466   - mutex_lock(&port->serial->disc_mutex);
467   - if (!port->serial->disconnected)
468   - cp210x_set_config_single(port, CP210X_IFC_ENABLE, UART_DISABLE);
469   - mutex_unlock(&port->serial->disc_mutex);
  465 + cp210x_set_config_single(port, CP210X_IFC_ENABLE, UART_DISABLE);
470 466 }
471 467  
472 468 /*