[080/141] USB: whiteheat: fix broken port configuration

Steven Rostedt
2013-07-03T19:00:46Z

[-- Attachment #1: 0080-USB-whiteheat-fix-broken-port-configuration.patch --]
[-- Type: text/plain, Size: 1175 bytes --]

3.6.11.6 stable review patch.
If anyone has any objections, please let me know.

------------------

From: Johan Hovold <jhovold@gmail.com>

[ Upstream commit 9eecf22d2b375b9064a20421c6c307b760b03d46 ]

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>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
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 bd36321..e8d650b 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -720,7 +720,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.7.10.4