Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fcb2e6e authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: kl5kusb105: 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: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bca87e9e

drivers/usb/serial/kl5kusb105.c

+11 −16
Original line number Diff line number Diff line
@@ -341,8 +341,6 @@ static void klsi_105_close(struct usb_serial_port *port) 
{

	int rc;



	mutex_lock(&port->serial->disc_mutex);

	if (!port->serial->disconnected) {

	/* send READ_OFF */

	rc = usb_control_msg(port->serial->dev,

			     usb_sndctrlpipe(port->serial->dev, 0),
@@ -353,10 +351,7 @@ static void klsi_105_close(struct usb_serial_port *port) 
			     NULL, 0,

			     KLSI_TIMEOUT);

	if (rc < 0)

			dev_err(&port->dev,

				"Disabling read failed (error = %d)\n", rc);

	}

	mutex_unlock(&port->serial->disc_mutex);

		dev_err(&port->dev, "failed to disable read: %d\n", rc);



	/* shutdown our bulk reads and writes */

	usb_serial_generic_close(port);