diff options
author | Johan Hovold <jhovold@gmail.com> | 2013-06-06 13:32:47 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2013-06-19 02:16:56 +0100 |
commit | d5567ec48e25d29d61a33bccd6047e1f7bd82da9 (patch) | |
tree | 44f96eefd51034cefad42d9b1b170d63834529bd /drivers/usb | |
parent | 5b9ca6b68cfa7fffcf9db83dbca90bbcad57d040 (diff) |
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/serial/whiteheat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index 59d646d207b..0ec60cd8a93 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c @@ -1209,7 +1209,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) { |