[ 3.5.y.z extended stable ] Patch "USB: whiteheat: fix broken port configuration" has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Tue Jun 11 09:21:23 UTC 2013


This is a note to let you know that I have just added a patch titled

    USB: whiteheat: fix broken port configuration

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 34ef8acf850822b97413cc503fb8e23c2ecbaa37 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold at gmail.com>
Date: Thu, 6 Jun 2013 13:32:47 +0200
Subject: [PATCH] USB: whiteheat: fix broken port configuration

commit 9eecf22d2b375b9064a20421c6c307b760b03d46 upstream.

When configuring the port (e.g. set_termios) the port minor number
rather than the port number was used in the request (and they only
coincide for minor number 0).

Signed-off-by: Johan Hovold <jhovold at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/usb/serial/whiteheat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index b65ac03..65e093e 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -727,7 +727,7 @@ static void firm_setup_port(struct tty_struct *tty)
 	struct whiteheat_port_settings port_settings;
 	unsigned int cflag = tty->termios->c_cflag;

-	port_settings.port = port->number + 1;
+	port_settings.port = port->number - port->serial->minor + 1;

 	/* get the byte size */
 	switch (cflag & CSIZE) {
--
1.8.1.2





More information about the kernel-team mailing list