7 files changed, 26 insertions, 15 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 1889a63ebc22..0d934bfbdd9b 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2839,6 +2839,8 @@ int __init early_serial_setup(struct uart_port *port)
         p->flags        = port->flags;
         p->mapbase      = port->mapbase;
         p->private_data = port->private_data;
+        p->type         = port->type;
+        p->line         = port->line;
 
         set_io_from_upio(p);
         if (port->serial_in)
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index c088146b7513..2a3671233b15 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -602,6 +602,10 @@ static int pci_netmos_init(struct pci_dev *dev)
         /* subdevice 0x00PS means <P> parallel, <S> serial */
         unsigned int num_serial = dev->subsystem_device & 0xf;
 
+        if (dev->subsystem_vendor == PCI_VENDOR_ID_IBM &&
+                        dev->subsystem_device == 0x0299)
+                return 0;
+
         if (num_serial == 0)
                 return -ENODEV;
         return num_serial;
@@ -3096,6 +3100,10 @@ static struct pci_device_id serial_pci_tbl[] = {
                 0,
                 pbn_b0_8_115200 },
 
+        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
+                PCI_VENDOR_ID_IBM, 0x0299,
+                0, 0, pbn_b0_bt_2_115200 },
+
         /*
          * These entries match devices with class COMMUNICATION_SERIAL,
          * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index fde7f9ccf57e..bbcfc26a3b6d 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -270,6 +270,8 @@ static const struct pnp_device_id pnp_dev_table[] = {
         {       "RSS0250",              0       },
         /* SupraExpress 28.8 Data/Fax PnP modem */
         {       "SUP1310",              0       },
+        /* SupraExpress 336i PnP Voice Modem */
+        {       "SUP1381",              0       },
         /* SupraExpress 33.6 Data/Fax PnP modem */
         {       "SUP1421",              0       },
         /* SupraExpress 33.6 Data/Fax PnP modem */
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index d5efd6c77904..89362d733d62 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -579,7 +579,7 @@ static void atmel_tx_dma(struct uart_port *port)
         /* disable PDC transmit */
         UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);
 
-        if (!uart_circ_empty(xmit)) {
+        if (!uart_circ_empty(xmit) && !uart_tx_stopped(port)) {
                 dma_sync_single_for_device(port->dev,
                                            pdc->dma_addr,
                                            pdc->dma_size,
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c
index b7584ca55ade..e6390d023634 100644
--- a/drivers/serial/jsm/jsm_neo.c
+++ b/drivers/serial/jsm/jsm_neo.c
@@ -577,9 +577,6 @@ static void neo_parse_modem(struct jsm_channel *ch, u8 signals)
         jsm_printk(MSIGS, INFO, &ch->ch_bd->pci_dev,
                         "neo_parse_modem: port: %d msignals: %x\n", ch->ch_portnum, msignals);
 
-        if (!ch)
-                return;
-
         /* Scrub off lower bits. They signify delta's, which I don't care about */
         /* Keep DDCD and DDSR though */
         msignals &= 0xf8;
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index a821e3a3d664..14f8fa9135be 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -163,6 +163,7 @@ static struct of_device_id __devinitdata of_platform_serial_table[] = {
         { .type = "serial", .compatible = "ns16450",  .data = (void *)PORT_16450, },
         { .type = "serial", .compatible = "ns16550",  .data = (void *)PORT_16550, },
         { .type = "serial", .compatible = "ns16750",  .data = (void *)PORT_16750, },
+        { .type = "serial", .compatible = "ns16850",  .data = (void *)PORT_16850, },
 #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL
         { .type = "serial", .compatible = "ibm,qpace-nwp-serial",
                                         .data = (void *)PORT_NWPSERIAL, },
diff --git a/drivers/serial/pnx8xxx_uart.c b/drivers/serial/pnx8xxx_uart.c
index 22e30d21225e..1bb8f1b45767 100644
--- a/drivers/serial/pnx8xxx_uart.c
+++ b/drivers/serial/pnx8xxx_uart.c
@@ -187,7 +187,7 @@ static void pnx8xxx_rx_chars(struct pnx8xxx_port *sport)
         status = FIFO_TO_SM(serial_in(sport, PNX8XXX_FIFO)) |
                  ISTAT_TO_SM(serial_in(sport, PNX8XXX_ISTAT));
         while (status & FIFO_TO_SM(PNX8XXX_UART_FIFO_RXFIFO)) {
-                ch = serial_in(sport, PNX8XXX_FIFO);
+                ch = serial_in(sport, PNX8XXX_FIFO) & 0xff;
 
                 sport->port.icount.rx++;
 
@@ -198,9 +198,16 @@ static void pnx8xxx_rx_chars(struct pnx8xxx_port *sport)
                  * out of the main execution path
                  */
                 if (status & (FIFO_TO_SM(PNX8XXX_UART_FIFO_RXFE |
-                                        PNX8XXX_UART_FIFO_RXPAR) |
+                                        PNX8XXX_UART_FIFO_RXPAR |
+                                        PNX8XXX_UART_FIFO_RXBRK) |
                               ISTAT_TO_SM(PNX8XXX_UART_INT_RXOVRN))) {
-                        if (status & FIFO_TO_SM(PNX8XXX_UART_FIFO_RXPAR))
+                        if (status & FIFO_TO_SM(PNX8XXX_UART_FIFO_RXBRK)) {
+                                status &= ~(FIFO_TO_SM(PNX8XXX_UART_FIFO_RXFE) |
+                                        FIFO_TO_SM(PNX8XXX_UART_FIFO_RXPAR));
+                                sport->port.icount.brk++;
+                                if (uart_handle_break(&sport->port))
+                                        goto ignore_char;
+                        } else if (status & FIFO_TO_SM(PNX8XXX_UART_FIFO_RXPAR))
                                 sport->port.icount.parity++;
                         else if (status & FIFO_TO_SM(PNX8XXX_UART_FIFO_RXFE))
                                 sport->port.icount.frame++;
@@ -284,14 +291,8 @@ static irqreturn_t pnx8xxx_int(int irq, void *dev_id)
         /* Get the interrupts */
         status  = serial_in(sport, PNX8XXX_ISTAT) & serial_in(sport, PNX8XXX_IEN);
 
-        /* Break signal received */
-        if (status & PNX8XXX_UART_INT_BREAK) {
-                sport->port.icount.brk++;
-                uart_handle_break(&sport->port);
-        }
-
-        /* Byte received */
-        if (status & PNX8XXX_UART_INT_RX)
+        /* Byte or break signal received */
+        if (status & (PNX8XXX_UART_INT_RX | PNX8XXX_UART_INT_BREAK))
                 pnx8xxx_rx_chars(sport);
 
         /* TX holding register empty - transmit a byte */