Merge tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[pandora-kernel.git] / drivers / usb / serial / io_ti.c

diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 21c7efa..a2209cd 100644 (file)
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -1835,7 +1835,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
 
        /* set up the port settings */
        if (tty)
-               edge_set_termios(tty, port, tty->termios);
+               edge_set_termios(tty, port, &tty->termios);
 
        /* open up the port */
 
@@ -2218,12 +2218,12 @@ static void change_port_settings(struct tty_struct *tty,
 
        config = kmalloc (sizeof (*config), GFP_KERNEL);
        if (!config) {
-               *tty->termios = *old_termios;
+               tty->termios = *old_termios;
                dev_err(dev, "%s - out of memory\n", __func__);
                return;
        }
 
-       cflag = tty->termios->c_cflag;
+       cflag = tty->termios.c_cflag;
 
        config->wFlags = 0;
 
@@ -2307,7 +2307,7 @@ static void change_port_settings(struct tty_struct *tty,
        } else
                dev_dbg(dev, "%s - OUTBOUND XON/XOFF is disabled\n", __func__);
 
-       tty->termios->c_cflag &= ~CMSPAR;
+       tty->termios.c_cflag &= ~CMSPAR;
 
        /* Round the baud rate */
        baud = tty_get_baud_rate(tty);
@@ -2352,10 +2352,10 @@ static void edge_set_termios(struct tty_struct *tty,
        struct edgeport_port *edge_port = usb_get_serial_port_data(port);
        unsigned int cflag;
 
-       cflag = tty->termios->c_cflag;
+       cflag = tty->termios.c_cflag;
 
        dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__,
-               tty->termios->c_cflag, tty->termios->c_iflag);
+               tty->termios.c_cflag, tty->termios.c_iflag);
        dev_dbg(&port->dev, "%s - old clfag %08x old iflag %08x\n", __func__,
                old_termios->c_cflag, old_termios->c_iflag);
        dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number);