6 files changed, 75 insertions, 72 deletions

diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index 36ede02ceacf..24485cc62ff8 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -328,15 +328,7 @@ static const struct pnp_device_id pnp_dev_table[] = {
         /* U.S. Robotics 56K Voice INT PnP*/
         {       "USR9190",              0       },
         /* Wacom tablets */
-        {       "WACF004",              0       },
-        {       "WACF005",              0       },
-        {       "WACF006",              0       },
-        {       "WACF007",              0       },
-        {       "WACF008",              0       },
-        {       "WACF009",              0       },
-        {       "WACF00A",              0       },
-        {       "WACF00B",              0       },
-        {       "WACF00C",              0       },
+        {       "WACFXXX",              0       },
         /* Compaq touchscreen */
         {       "FPI2002",              0 },
         /* Fujitsu Stylistic touchscreens */
@@ -354,6 +346,8 @@ static const struct pnp_device_id pnp_dev_table[] = {
         {       "FUJ02E5",              0       },
         /* Fujitsu P-series tablet PC device */
         {       "FUJ02E6",              0       },
+        /* Fujitsu Wacom 2FGT Tablet PC device */
+        {       "FUJ02E7",              0       },
         /*
          * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in
          * disguise)
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 18130f11238e..60d665a17a88 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -1088,7 +1088,7 @@ imx_console_get_options(struct imx_port *sport, int *baud,
                            int *parity, int *bits)
 {
 
-        if ( readl(sport->port.membase + UCR1) | UCR1_UARTEN ) {
+        if (readl(sport->port.membase + UCR1) & UCR1_UARTEN) {
                 /* ok, the port was enabled */
                 unsigned int ucr2, ubir,ubmr, uartclk;
                 unsigned int baud_raw;
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 0700cd10b97c..683e66f18e8c 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -411,6 +411,17 @@ static void pmz_transmit_chars(struct uart_pmac_port *uap)
                 goto ack_tx_int;
         }
 
+        /* Under some circumstances, we see interrupts reported for
+         * a closed channel. The interrupt mask in R1 is clear, but
+         * R3 still signals the interrupts and we see them when taking
+         * an interrupt for the other channel (this could be a qemu
+         * bug but since the ESCC doc doesn't specify precsiely whether
+         * R3 interrup status bits are masked by R1 interrupt enable
+         * bits, better safe than sorry). --BenH.
+         */
+        if (!ZS_IS_OPEN(uap))
+                goto ack_tx_int;
+
         if (uap->port.x_char) {
                 uap->flags |= PMACZILOG_FLAG_TX_ACTIVE;
                 write_zsdata(uap, uap->port.x_char);
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 047530b285bb..7f2830709512 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -385,13 +385,20 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
                 }
 
                 /*
-                 * As a last resort, if the quotient is zero,
-                 * default to 9600 bps
+                 * As a last resort, if the range cannot be met then clip to
+                 * the nearest chip supported rate.
                  */
-                if (!hung_up)
-                        tty_termios_encode_baud_rate(termios, 9600, 9600);
+                if (!hung_up) {
+                        if (baud <= min)
+                                tty_termios_encode_baud_rate(termios,
+                                                        min + 1, min + 1);
+                        else
+                                tty_termios_encode_baud_rate(termios,
+                                                        max - 1, max - 1);
+                }
         }
-
+        /* Should never happen */
+        WARN_ON(1);
         return 0;
 }
 
@@ -2006,12 +2013,6 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
 
         mutex_lock(&port->mutex);
 
-        if (!console_suspend_enabled && uart_console(uport)) {
-                /* we're going to avoid suspending serial console */
-                mutex_unlock(&port->mutex);
-                return 0;
-        }
-
         tty_dev = device_find_child(uport->dev, &match, serial_match_port);
         if (device_may_wakeup(tty_dev)) {
                 enable_irq_wake(uport->irq);
@@ -2019,20 +2020,23 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
                 mutex_unlock(&port->mutex);
                 return 0;
         }
-        uport->suspended = 1;
+        if (console_suspend_enabled || !uart_console(uport))
+                uport->suspended = 1;
 
         if (port->flags & ASYNC_INITIALIZED) {
                 const struct uart_ops *ops = uport->ops;
                 int tries;
 
-                set_bit(ASYNCB_SUSPENDED, &port->flags);
-                clear_bit(ASYNCB_INITIALIZED, &port->flags);
+                if (console_suspend_enabled || !uart_console(uport)) {
+                        set_bit(ASYNCB_SUSPENDED, &port->flags);
+                        clear_bit(ASYNCB_INITIALIZED, &port->flags);
 
-                spin_lock_irq(&uport->lock);
-                ops->stop_tx(uport);
-                ops->set_mctrl(uport, 0);
-                ops->stop_rx(uport);
-                spin_unlock_irq(&uport->lock);
+                        spin_lock_irq(&uport->lock);
+                        ops->stop_tx(uport);
+                        ops->set_mctrl(uport, 0);
+                        ops->stop_rx(uport);
+                        spin_unlock_irq(&uport->lock);
+                }
 
                 /*
                  * Wait for the transmitter to empty.
@@ -2047,16 +2051,18 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
                                drv->dev_name,
                                drv->tty_driver->name_base + uport->line);
 
-                ops->shutdown(uport);
+                if (console_suspend_enabled || !uart_console(uport))
+                        ops->shutdown(uport);
         }
 
         /*
          * Disable the console device before suspending.
          */
-        if (uart_console(uport))
+        if (console_suspend_enabled && uart_console(uport))
                 console_stop(uport->cons);
 
-        uart_change_pm(state, 3);
+        if (console_suspend_enabled || !uart_console(uport))
+                uart_change_pm(state, 3);
 
         mutex_unlock(&port->mutex);
 
@@ -2073,29 +2079,6 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
 
         mutex_lock(&port->mutex);
 
-        if (!console_suspend_enabled && uart_console(uport)) {
-                /* no need to resume serial console, it wasn't suspended */
-                /*
-                 * First try to use the console cflag setting.
-                 */
-                memset(&termios, 0, sizeof(struct ktermios));
-                termios.c_cflag = uport->cons->cflag;
-                /*
-                 * If that's unset, use the tty termios setting.
-                 */
-                if (termios.c_cflag == 0)
-                        termios = *state->port.tty->termios;
-                else {
-                        termios.c_ispeed = termios.c_ospeed =
-                                tty_termios_input_baud_rate(&termios);
-                        termios.c_ispeed = termios.c_ospeed =
-                                tty_termios_baud_rate(&termios);
-                }
-                uport->ops->set_termios(uport, &termios, NULL);
-                mutex_unlock(&port->mutex);
-                return 0;
-        }
-
         tty_dev = device_find_child(uport->dev, &match, serial_match_port);
         if (!uport->suspended && device_may_wakeup(tty_dev)) {
                 disable_irq_wake(uport->irq);
@@ -2121,21 +2104,23 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
                 spin_lock_irq(&uport->lock);
                 ops->set_mctrl(uport, 0);
                 spin_unlock_irq(&uport->lock);
-                ret = ops->startup(uport);
-                if (ret == 0) {
-                        uart_change_speed(state, NULL);
-                        spin_lock_irq(&uport->lock);
-                        ops->set_mctrl(uport, uport->mctrl);
-                        ops->start_tx(uport);
-                        spin_unlock_irq(&uport->lock);
-                        set_bit(ASYNCB_INITIALIZED, &port->flags);
-                } else {
-                        /*
-                         * Failed to resume - maybe hardware went away?
-                         * Clear the "initialized" flag so we won't try
-                         * to call the low level drivers shutdown method.
-                         */
-                        uart_shutdown(state);
+                if (console_suspend_enabled || !uart_console(uport)) {
+                        ret = ops->startup(uport);
+                        if (ret == 0) {
+                                uart_change_speed(state, NULL);
+                                spin_lock_irq(&uport->lock);
+                                ops->set_mctrl(uport, uport->mctrl);
+                                ops->start_tx(uport);
+                                spin_unlock_irq(&uport->lock);
+                                set_bit(ASYNCB_INITIALIZED, &port->flags);
+                        } else {
+                                /*
+                                 * Failed to resume - maybe hardware went away?
+                                 * Clear the "initialized" flag so we won't try
+                                 * to call the low level drivers shutdown method.
+                                 */
+                                uart_shutdown(state);
+                        }
                 }
 
                 clear_bit(ASYNCB_SUSPENDED, &port->flags);
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 0ee7239c5d69..95421fa3b304 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -146,7 +146,8 @@ static void quirk_wakeup_oxsemi(struct pcmcia_device *link)
 {
         struct serial_info *info = link->priv;
 
-        outb(12, info->c950ctrl + 1);
+        if (info->c950ctrl)
+                outb(12, info->c950ctrl + 1);
 }
 
 /* request_region? oxsemi branch does no request_region too... */
@@ -757,6 +758,7 @@ static struct pcmcia_device_id serial_ids[] = {
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "LanModem", 0xdcfe12d3, 0xc67c648f),
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "Xircom", "CreditCard Ethernet+Modem II", 0x2e3ee845, 0xeca401bf),
+        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0e01),
         PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0a05),
         PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x1101),
         PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0104, 0x0070),
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 37f0de9dd9ce..42f3333c4ad0 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1052,7 +1052,18 @@ static void __devinit sci_init_single(struct platform_device *dev,
         sci_port->port.ops      = &sci_uart_ops;
         sci_port->port.iotype   = UPIO_MEM;
         sci_port->port.line     = index;
-        sci_port->port.fifosize = 1;
+
+        switch (p->type) {
+        case PORT_SCIFA:
+                sci_port->port.fifosize = 64;
+                break;
+        case PORT_SCIF:
+                sci_port->port.fifosize = 16;
+                break;
+        default:
+                sci_port->port.fifosize = 1;
+                break;
+        }
 
         if (dev) {
                 sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL;