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-06 09:02:36 -0700
commit9eecf22d2b375b9064a20421c6c307b760b03d46 (patch)
treebbf1942e084e51b39f9cce524067428b25eaa8df
parentf4488035abdac56682153aa0cff3d1dce84e1c54 (diff)
downloadlinux-9eecf22d2b375b9064a20421c6c307b760b03d46.tar.gz
linux-9eecf22d2b375b9064a20421c6c307b760b03d46.tar.xz
USB: whiteheat: fix broken port configuration
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). Cc: stable@vger.kernel.org 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 b9fca35..347caad 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -649,7 +649,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) {