Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 22 insertions, 20 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index f94109cbb46e..b8a4bd94f51d 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2047,7 +2047,7 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
          * Oxford Semi 952 rev B workaround
          */
         if (up->bugs & UART_BUG_QUOT && (quot & 0xff) == 0)
-                quot ++;
+                quot++;
 
         if (up->capabilities & UART_CAP_FIFO && up->port.fifosize > 1) {
                 if (baud < 2400)
@@ -2662,16 +2662,17 @@ static int __devinit serial8250_probe(struct platform_device *dev)
         memset(&port, 0, sizeof(struct uart_port));
 
         for (i = 0; p && p->flags != 0; p++, i++) {
-                port.iobase     = p->iobase;
-                port.membase    = p->membase;
-                port.irq        = p->irq;
-                port.uartclk    = p->uartclk;
-                port.regshift   = p->regshift;
-                port.iotype     = p->iotype;
-                port.flags      = p->flags;
-                port.mapbase    = p->mapbase;
-                port.hub6       = p->hub6;
-                port.dev        = &dev->dev;
+                port.iobase             = p->iobase;
+                port.membase            = p->membase;
+                port.irq                = p->irq;
+                port.uartclk            = p->uartclk;
+                port.regshift           = p->regshift;
+                port.iotype             = p->iotype;
+                port.flags              = p->flags;
+                port.mapbase            = p->mapbase;
+                port.hub6               = p->hub6;
+                port.private_data       = p->private_data;
+                port.dev                = &dev->dev;
                 if (share_irqs)
                         port.flags |= UPF_SHARE_IRQ;
                 ret = serial8250_register_port(&port);
@@ -2812,15 +2813,16 @@ int serial8250_register_port(struct uart_port *port)
         if (uart) {
                 uart_remove_one_port(&serial8250_reg, &uart->port);
 
-                uart->port.iobase   = port->iobase;
-                uart->port.membase  = port->membase;
-                uart->port.irq      = port->irq;
-                uart->port.uartclk  = port->uartclk;
-                uart->port.fifosize = port->fifosize;
-                uart->port.regshift = port->regshift;
-                uart->port.iotype   = port->iotype;
-                uart->port.flags    = port->flags | UPF_BOOT_AUTOCONF;
-                uart->port.mapbase  = port->mapbase;
+                uart->port.iobase       = port->iobase;
+                uart->port.membase      = port->membase;
+                uart->port.irq          = port->irq;
+                uart->port.uartclk      = port->uartclk;
+                uart->port.fifosize     = port->fifosize;
+                uart->port.regshift     = port->regshift;
+                uart->port.iotype       = port->iotype;
+                uart->port.flags        = port->flags | UPF_BOOT_AUTOCONF;
+                uart->port.mapbase      = port->mapbase;
+                uart->port.private_data = port->private_data;
                 if (port->dev)
                         uart->port.dev = port->dev;