Skip to contentSkip to conversation

Patch "USB: serial: ch341: fix open error handling" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Jan 17, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

USB: serial: ch341: fix open error handling

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
usb-serial-ch341-fix-open-error-handling.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From f2950b78547ffb8475297ada6b92bc2d774d5461 Mon Sep 17 00:00:00 2001

From: Johan Hovold <[email protected]>
Date: Fri, 6 Jan 2017 19:15:13 +0100
Subject: USB: serial: ch341: fix open error handling

From: Johan Hovold <[email protected]>

commit f2950b78547ffb8475297ada6b92bc2d774d5461 upstream.

Make sure to stop the interrupt URB before returning on errors during open.

Fixes 664d5df92e88 ("USB: usb-serial ch341: support for DTR/RTS/CTS")
---
 drivers/usb/serial/ch341.c |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/usb/serial/ch341.c +10 -3
@@ -314,7 +314,7 @@ static int ch341_open(struct tty_struct
 
 	r = ch341_configure(serial->dev, priv);
 	if (r)
-		goto out;
+		return r;
 
 	if (tty)
 		ch341_set_termios(tty, port, NULL);
@@ -324,12 +324,19 @@ static int ch341_open(struct tty_struct
 	if (r) {
 		dev_err(&port->dev, "%s - failed to submit interrupt urb: %d\n",
 			__func__, r);
-		goto out;
+		return r;
 	}
 
 	r = usb_serial_generic_open(tty, port);
+	if (r)
+		goto err_kill_interrupt_urb;
+
+	return 0;
+
+err_kill_interrupt_urb:
+	usb_kill_urb(port->interrupt_in_urb);
 
-out:	return r;
+	return r;
 }
 
 /* Old_termios contains the original termios settings and

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/usb-serial-ch341-fix-control-message-error-handling.patch queue-4.4/usb-serial-ch341-fix-open-and-resume-after-b0.patch queue-4.4/usb-serial-ch341-fix-open-error-handling.patch queue-4.4/usb-serial-ch341-fix-initial-modem-control-state.patch queue-4.4/usb-serial-kl5kusb105-fix-line-state-error-handling.patch queue-4.4/usb-serial-ch341-fix-resume-after-reset.patch