summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-06-06 13:32:47 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-13 09:44:55 -0700
commitd3a677e63a19355155ff83acf46d1ede8845ffaf (patch)
tree3c4d15d50dcf30e40f354cd5647201b6c5442778
parent617d12d484ae22a85d6da8e94cf55dd91594fd87 (diff)
downloadlinux-3.10-d3a677e63a19355155ff83acf46d1ede8845ffaf.tar.gz
linux-3.10-d3a677e63a19355155ff83acf46d1ede8845ffaf.tar.bz2
linux-3.10-d3a677e63a19355155ff83acf46d1ede8845ffaf.zip
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@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/whiteheat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 171226ab56f..0d06d7ca86f 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -1154,7 +1154,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) {