From 57f968f7e29889a745f8c2dc5614c43a4c746f40 Mon Sep 17 00:00:00 2001 From: David Daney Date: Fri, 2 Jan 2009 13:49:41 +0000 Subject: [PATCH] --- yaml --- r: 125085 b: refs/heads/master c: b430428a188e8a434325e251d0704af4b88b4711 h: refs/heads/master i: 125083: 1f346726ea2d9e1151a0f7c72f5732118bb973df v: v3 --- [refs] | 2 +- trunk/drivers/serial/8250.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index acc24c20d6a1..f9412d104d20 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc3256288b8ff9787623805e53cf7c6d5a2b4591 +refs/heads/master: b430428a188e8a434325e251d0704af4b88b4711 diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c index 303272af386e..8e28750a4058 100644 --- a/trunk/drivers/serial/8250.c +++ b/trunk/drivers/serial/8250.c @@ -2752,12 +2752,23 @@ static struct uart_driver serial8250_reg = { */ int __init early_serial_setup(struct uart_port *port) { + struct uart_port *p; + if (port->line >= ARRAY_SIZE(serial8250_ports)) return -ENODEV; serial8250_isa_init_ports(); - serial8250_ports[port->line].port = *port; - serial8250_ports[port->line].port.ops = &serial8250_pops; + p = &serial8250_ports[port->line].port; + p->iobase = port->iobase; + p->membase = port->membase; + p->irq = port->irq; + p->uartclk = port->uartclk; + p->fifosize = port->fifosize; + p->regshift = port->regshift; + p->iotype = port->iotype; + p->flags = port->flags; + p->mapbase = port->mapbase; + p->private_data = port->private_data; return 0; }