Merge 3.10-rc7 into usb-next

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / usb / serial / ti_usb_3410_5052.c

diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index e581c25..7182bb7 100644 (file)
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -477,7 +477,7 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
        if (mutex_lock_interruptible(&tdev->td_open_close_lock))
                return -ERESTARTSYS;
 
-       port_number = port->number - port->serial->minor;
+       port_number = port->port_number;
 
        tport->tp_msr = 0;
        tport->tp_shadow_mcr |= (TI_MCR_RTS | TI_MCR_DTR);
@@ -619,7 +619,7 @@ static void ti_close(struct usb_serial_port *port)
        kfifo_reset_out(&tport->write_fifo);
        spin_unlock_irqrestore(&tport->tp_lock, flags);
 
-       port_number = port->number - port->serial->minor;
+       port_number = port->port_number;
 
        dev_dbg(&port->dev, "%s - sending TI_CLOSE_PORT\n", __func__);
        status = ti_command_out_sync(tdev, TI_CLOSE_PORT,
@@ -777,7 +777,7 @@ static void ti_set_termios(struct tty_struct *tty,
        tcflag_t cflag, iflag;
        int baud;
        int status;
-       int port_number = port->number - port->serial->minor;
+       int port_number = port->port_number;
        unsigned int mcr;
 
        cflag = tty->termios.c_cflag;
@@ -1263,7 +1263,7 @@ static int ti_get_lsr(struct ti_port *tport, u8 *lsr)
        int size, status;
        struct ti_device *tdev = tport->tp_tdev;
        struct usb_serial_port *port = tport->tp_port;
-       int port_number = port->number - port->serial->minor;
+       int port_number = port->port_number;
        struct ti_port_status *data;
 
        size = sizeof(struct ti_port_status);
@@ -1309,8 +1309,8 @@ static int ti_get_serial_info(struct ti_port *tport,
        memset(&ret_serial, 0, sizeof(ret_serial));
 
        ret_serial.type = PORT_16550A;
-       ret_serial.line = port->serial->minor;
-       ret_serial.port = port->number - port->serial->minor;
+       ret_serial.line = port->minor;
+       ret_serial.port = port->port_number;
        ret_serial.flags = tport->tp_flags;
        ret_serial.xmit_fifo_size = TI_WRITE_BUF_SIZE;
        ret_serial.baud_base = tport->tp_tdev->td_is_3410 ? 921600 : 460800;