9 files changed, 44 insertions, 14 deletions

diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index 2aa6bfe8fdb3..f59463601874 100644
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -51,6 +51,7 @@ extern int  kgdb_output_string (const char* s, unsigned int count);
 
 /* #ifdef CONFIG_SERIAL_CONSOLE */ /* This seems to be a post 2.0 thing - mles */
 #include <linux/console.h>
+#include <linux/jiffies.h>
 
 /* this defines the index into rs_table for the port to use
  */
@@ -1729,7 +1730,7 @@ static void rs_360_wait_until_sent(struct tty_struct *tty, int timeout)
                 msleep_interruptible(jiffies_to_msecs(char_time));
                 if (signal_pending(current))
                         break;
-                if (timeout && ((orig_jiffies + timeout) < jiffies))
+                if (timeout && (time_after(jiffies, orig_jiffies + timeout)))
                         break;
                 /* The 'tx_cur' is really the next buffer to send.  We
                  * have to back up to the previous BD and wait for it
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 96a585e1cee8..ea41f2626458 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1868,6 +1868,7 @@ static int serial8250_startup(struct uart_port *port)
         }
 
         if (is_real_interrupt(up->port.irq)) {
+                unsigned char iir1;
                 /*
                  * Test for UARTs that do not reassert THRE when the
                  * transmitter is idle and the interrupt has already
@@ -1881,7 +1882,7 @@ static int serial8250_startup(struct uart_port *port)
                 wait_for_xmitr(up, UART_LSR_THRE);
                 serial_out_sync(up, UART_IER, UART_IER_THRI);
                 udelay(1); /* allow THRE to set */
-                serial_in(up, UART_IIR);
+                iir1 = serial_in(up, UART_IIR);
                 serial_out(up, UART_IER, 0);
                 serial_out_sync(up, UART_IER, UART_IER_THRI);
                 udelay(1); /* allow a working UART time to re-assert THRE */
@@ -1894,7 +1895,7 @@ static int serial8250_startup(struct uart_port *port)
                  * If the interrupt is not reasserted, setup a timer to
                  * kick the UART on a regular basis.
                  */
-                if (iir & UART_IIR_NO_INT) {
+                if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) {
                         pr_debug("ttyS%d - using backup timer\n", port->line);
                         up->timer.function = serial8250_backup_timeout;
                         up->timer.data = (unsigned long)up;
@@ -2228,7 +2229,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
         }
         serial8250_set_mctrl(&up->port, up->port.mctrl);
         spin_unlock_irqrestore(&up->port.lock, flags);
-        tty_termios_encode_baud_rate(termios, baud, baud);
+        /* Don't rewrite B0 */
+        if (tty_termios_baud_rate(termios))
+                tty_termios_encode_baud_rate(termios, baud, baud);
 }
 
 static void
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index f97224ce59da..6e57382b9137 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -775,7 +775,7 @@ pci_default_setup(struct serial_private *priv, struct pciserial_board *board,
  * This list is ordered alphabetically by vendor then device.
  * Specific entries must come before more generic entries.
  */
-static struct pci_serial_quirk pci_serial_quirks[] = {
+static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
         /*
         * ADDI-DATA GmbH communication cards <info@addi-data.com>
         */
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 55492fa095a2..c065a704a93a 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -96,7 +96,6 @@
 
  /* PDC registers */
 #define UART_PUT_PTCR(port,v)   __raw_writel(v, (port)->membase + ATMEL_PDC_PTCR)
-#define UART_GET_TCR(port)      __raw_readl((port)->membase + ATMEL_PDC_TCR)
 #define UART_GET_PTSR(port)     __raw_readl((port)->membase + ATMEL_PDC_PTSR)
 
 #define UART_PUT_RPR(port,v)    __raw_writel(v, (port)->membase + ATMEL_PDC_RPR)
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 383c4e660cd5..88e7c1d5b919 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -3582,6 +3582,8 @@ rs_tiocmset(struct tty_struct *tty, struct file *file,
 {
         struct e100_serial *info = (struct e100_serial *)tty->driver_data;
 
+        lock_kernel();
+
         if (clear & TIOCM_RTS)
                 e100_rts(info, 0);
         if (clear & TIOCM_DTR)
@@ -3601,6 +3603,8 @@ rs_tiocmset(struct tty_struct *tty, struct file *file,
                 e100_ri_out(info, 1);
         if (set & TIOCM_CD)
                 e100_cd_out(info, 1);
+
+        unlock_kernel();
         return 0;
 }
 
@@ -3610,6 +3614,7 @@ rs_tiocmget(struct tty_struct *tty, struct file *file)
         struct e100_serial *info = (struct e100_serial *)tty->driver_data;
         unsigned int result;
 
+        lock_kernel();
         result =
                 (!E100_RTS_GET(info) ? TIOCM_RTS : 0)
                 | (!E100_DTR_GET(info) ? TIOCM_DTR : 0)
@@ -3618,6 +3623,8 @@ rs_tiocmget(struct tty_struct *tty, struct file *file)
                 | (!E100_CD_GET(info) ? TIOCM_CAR : 0)
                 | (!E100_CTS_GET(info) ? TIOCM_CTS : 0);
 
+        unlock_kernel();
+
 #ifdef SERIAL_DEBUG_IO
         printk(KERN_DEBUG "ser%i: modem state: %i 0x%08X\n",
                 info->line, result, result);
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
index 116211fcd36f..0dddd68b20d2 100644
--- a/drivers/serial/dz.c
+++ b/drivers/serial/dz.c
@@ -819,7 +819,7 @@ static void dz_console_putchar(struct uart_port *uport, int ch)
                 dz_out(dport, DZ_TCR, mask);
                 iob();
                 udelay(2);
-        } while (loops--);
+        } while (--loops);
 
         if (loops)                              /* Cannot send otherwise. */
                 dz_out(dport, DZ_TDR, ch);
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index a9ca03ead3e5..977ce820ce30 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -329,13 +329,15 @@ EXPORT_SYMBOL(uart_update_timeout);
  *      If it's still invalid, we try 9600 baud.
  *
  *      Update the @termios structure to reflect the baud rate
- *      we're actually going to be using.
+ *      we're actually going to be using. Don't do this for the case
+ *      where B0 is requested ("hang up").
  */
 unsigned int
 uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
                    struct ktermios *old, unsigned int min, unsigned int max)
 {
         unsigned int try, baud, altbaud = 38400;
+        int hung_up = 0;
         upf_t flags = port->flags & UPF_SPD_MASK;
 
         if (flags == UPF_SPD_HI)
@@ -360,8 +362,10 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
                 /*
                  * Special case: B0 rate.
                  */
-                if (baud == 0)
+                if (baud == 0) {
+                        hung_up = 1;
                         baud = 9600;
+                }
 
                 if (baud >= min && baud <= max)
                         return baud;
@@ -373,7 +377,9 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
                 termios->c_cflag &= ~CBAUD;
                 if (old) {
                         baud = tty_termios_baud_rate(old);
-                        tty_termios_encode_baud_rate(termios, baud, baud);
+                        if (!hung_up)
+                                tty_termios_encode_baud_rate(termios,
+                                                                baud, baud);
                         old = NULL;
                         continue;
                 }
@@ -382,7 +388,8 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
                  * As a last resort, if the quotient is zero,
                  * default to 9600 bps
                  */
-                tty_termios_encode_baud_rate(termios, 9600, 9600);
+                if (!hung_up)
+                        tty_termios_encode_baud_rate(termios, 9600, 9600);
         }
 
         return 0;
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 3271379a36db..90a20a152ebf 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1231,7 +1231,7 @@ static inline struct console *SUNZILOG_CONSOLE(void)
 #define SUNZILOG_CONSOLE()      (NULL)
 #endif
 
-static void __devinit sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channel)
+static void __devinit sunzilog_init_kbdms(struct uart_sunzilog_port *up)
 {
         int baud, brg;
 
@@ -1305,7 +1305,7 @@ static void __devinit sunzilog_init_hw(struct uart_sunzilog_port *up)
                 up->curregs[R7] = 0x7E; /* SDLC Flag    */
                 up->curregs[R9] = NV;
                 up->curregs[R7p] = 0x00;
-                sunzilog_init_kbdms(up, up->port.line);
+                sunzilog_init_kbdms(up);
                 /* Only enable interrupts if an ISR handler available */
                 if (up->flags & SUNZILOG_FLAG_ISR_HANDLER)
                         up->curregs[R9] |= MIE;
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index 98ab649c1ff9..bb6ce6bba32f 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for NEC VR4100 series Serial Interface Unit.
  *
- *  Copyright (C) 2004-2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *  Copyright (C) 2004-2008  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *
  *  Based on drivers/serial/8250.c, by Russell King.
  *
@@ -840,6 +840,19 @@ static int __devinit siu_console_init(void)
 
 console_initcall(siu_console_init);
 
+void __init vr41xx_siu_early_setup(struct uart_port *port)
+{
+        if (port->type == PORT_UNKNOWN)
+                return;
+
+        siu_uart_ports[port->line].line = port->line;
+        siu_uart_ports[port->line].type = port->type;
+        siu_uart_ports[port->line].uartclk = SIU_BAUD_BASE * 16;
+        siu_uart_ports[port->line].mapbase = port->mapbase;
+        siu_uart_ports[port->line].mapbase = port->mapbase;
+        siu_uart_ports[port->line].ops = &siu_uart_ops;
+}
+
 #define SERIAL_VR41XX_CONSOLE   &siu_console
 #else
 #define SERIAL_VR41XX_CONSOLE   NULL