1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 347caad47a12..7eb34cd6b579 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -462,7 +462,7 @@ static int whiteheat_ioctl(struct tty_struct *tty,
                 memset(&serstruct, 0, sizeof(serstruct));
                 serstruct.type = PORT_16654;
                 serstruct.line = port->serial->minor;
-                serstruct.port = port->number;
+                serstruct.port = port->port_number;
                 serstruct.flags = ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
                 serstruct.xmit_fifo_size = kfifo_size(&port->write_fifo);
                 serstruct.custom_divisor = 0;
@@ -626,7 +626,7 @@ static int firm_open(struct usb_serial_port *port)
 {
         struct whiteheat_simple open_command;
 
-        open_command.port = port->number - port->serial->minor + 1;
+        open_command.port = port->port_number + 1;
         return firm_send_command(port, WHITEHEAT_OPEN,
                 (__u8 *)&open_command, sizeof(open_command));
 }
@@ -636,7 +636,7 @@ static int firm_close(struct usb_serial_port *port)
 {
         struct whiteheat_simple close_command;
 
-        close_command.port = port->number - port->serial->minor + 1;
+        close_command.port = port->port_number + 1;
         return firm_send_command(port, WHITEHEAT_CLOSE,
                         (__u8 *)&close_command, sizeof(close_command));
 }
@@ -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 - port->serial->minor + 1;
+        port_settings.port = port->port_number + 1;
 
         /* get the byte size */
         switch (cflag & CSIZE) {
@@ -726,7 +726,7 @@ static int firm_set_rts(struct usb_serial_port *port, __u8 onoff)
 {
         struct whiteheat_set_rdb rts_command;
 
-        rts_command.port = port->number - port->serial->minor + 1;
+        rts_command.port = port->port_number + 1;
         rts_command.state = onoff;
         return firm_send_command(port, WHITEHEAT_SET_RTS,
                         (__u8 *)&rts_command, sizeof(rts_command));
@@ -737,7 +737,7 @@ static int firm_set_dtr(struct usb_serial_port *port, __u8 onoff)
 {
         struct whiteheat_set_rdb dtr_command;
 
-        dtr_command.port = port->number - port->serial->minor + 1;
+        dtr_command.port = port->port_number + 1;
         dtr_command.state = onoff;
         return firm_send_command(port, WHITEHEAT_SET_DTR,
                         (__u8 *)&dtr_command, sizeof(dtr_command));
@@ -748,7 +748,7 @@ static int firm_set_break(struct usb_serial_port *port, __u8 onoff)
 {
         struct whiteheat_set_rdb break_command;
 
-        break_command.port = port->number - port->serial->minor + 1;
+        break_command.port = port->port_number + 1;
         break_command.state = onoff;
         return firm_send_command(port, WHITEHEAT_SET_BREAK,
                         (__u8 *)&break_command, sizeof(break_command));
@@ -759,7 +759,7 @@ static int firm_purge(struct usb_serial_port *port, __u8 rxtx)
 {
         struct whiteheat_purge purge_command;
 
-        purge_command.port = port->number - port->serial->minor + 1;
+        purge_command.port = port->port_number + 1;
         purge_command.what = rxtx;
         return firm_send_command(port, WHITEHEAT_PURGE,
                         (__u8 *)&purge_command, sizeof(purge_command));
@@ -770,7 +770,7 @@ static int firm_get_dtr_rts(struct usb_serial_port *port)
 {
         struct whiteheat_simple get_dr_command;
 
-        get_dr_command.port = port->number - port->serial->minor + 1;
+        get_dr_command.port = port->port_number + 1;
         return firm_send_command(port, WHITEHEAT_GET_DTR_RTS,
                         (__u8 *)&get_dr_command, sizeof(get_dr_command));
 }
@@ -780,7 +780,7 @@ static int firm_report_tx_done(struct usb_serial_port *port)
 {
         struct whiteheat_simple close_command;
 
-        close_command.port = port->number - port->serial->minor + 1;
+        close_command.port = port->port_number + 1;
         return firm_send_command(port, WHITEHEAT_REPORT_TX_DONE,
                         (__u8 *)&close_command, sizeof(close_command));
 }