Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6

[~andy/linux] / drivers / tty / moxa.c

diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index 35b0c38590e6b641aabdb45383030bebce31c3bd..ba679ce0a77456b1ecbeb6e674b67fbbb4ab1dac 100644 (file)
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -371,7 +371,7 @@ static int moxa_ioctl(struct tty_struct *tty,
                                        tmp.cflag = p->cflag;
                                else
                                        tmp.cflag = ttyp->termios->c_cflag;
-                               tty_kref_put(tty);
+                               tty_kref_put(ttyp);
 copy:
                                if (copy_to_user(argm, &tmp, sizeof(tmp)))
                                        return -EFAULT;
@@ -1129,7 +1129,6 @@ static void moxa_shutdown(struct tty_port *port)
        struct moxa_port *ch = container_of(port, struct moxa_port, port);
         MoxaPortDisable(ch);
        MoxaPortFlushData(ch, 2);
-       clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
 }
 
 static int moxa_carrier_raised(struct tty_port *port)
@@ -1155,7 +1154,6 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
        struct moxa_board_conf *brd;
        struct moxa_port *ch;
        int port;
-       int retval;
 
        port = tty->index;
        if (port == MAX_PORTS) {
@@ -1190,10 +1188,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
        mutex_unlock(&ch->port.mutex);
        mutex_unlock(&moxa_openlock);
 
-       retval = tty_port_block_til_ready(&ch->port, tty, filp);
-       if (retval == 0)
-               set_bit(ASYNCB_NORMAL_ACTIVE, &ch->port.flags);
-       return retval;
+       return tty_port_block_til_ready(&ch->port, tty, filp);
 }
 
 static void moxa_close(struct tty_struct *tty, struct file *filp)
@@ -1207,14 +1202,15 @@ static int moxa_write(struct tty_struct *tty,
                      const unsigned char *buf, int count)
 {
        struct moxa_port *ch = tty->driver_data;
+       unsigned long flags;
        int len;
 
        if (ch == NULL)
                return 0;
 
-       spin_lock_bh(&moxa_lock);
+       spin_lock_irqsave(&moxa_lock, flags);
        len = MoxaPortWriteData(tty, buf, count);
-       spin_unlock_bh(&moxa_lock);
+       spin_unlock_irqrestore(&moxa_lock, flags);
 
        set_bit(LOWWAIT, &ch->statusflags);
        return len;
@@ -1281,10 +1277,8 @@ static int moxa_tiocmset(struct tty_struct *tty,
                         unsigned int set, unsigned int clear)
 {
        struct moxa_port *ch;
-       int port;
        int dtr, rts;
 
-       port = tty->index;
        mutex_lock(&moxa_openlock);
        ch = tty->driver_data;
        if (!ch) {
@@ -1756,11 +1750,9 @@ static int MoxaPortSetTermio(struct moxa_port *port, struct ktermios *termio,
                speed_t baud)
 {
        void __iomem *ofsAddr;
-       tcflag_t cflag;
        tcflag_t mode = 0;
 
        ofsAddr = port->tableAddr;
-       cflag = termio->c_cflag;        /* termio->c_cflag */
 
        mode = termio->c_cflag & CSIZE;
        if (mode == CS5)