diff options
| author | David Daney <ddaney@caviumnetworks.com> | 2009-01-02 13:49:41 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 10:19:42 -0800 |
| commit | b430428a188e8a434325e251d0704af4b88b4711 (patch) | |
| tree | b00c4a1872c2a1db32002933f5b061d245787b1b /drivers/serial | |
| parent | bc3256288b8ff9787623805e53cf7c6d5a2b4591 (diff) | |
| download | linux-3.10-b430428a188e8a434325e251d0704af4b88b4711.tar.gz linux-3.10-b430428a188e8a434325e251d0704af4b88b4711.tar.bz2 linux-3.10-b430428a188e8a434325e251d0704af4b88b4711.zip | |
8250: Don't clobber spinlocks.
In serial8250_isa_init_ports(), the port's lock is initialized. We
should not overwrite it. In early_serial_setup(), only copy in the
fields we need. Since the early console code only uses a subset of
the fields, these are sufficient.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Tomaso Paoletti <tpaoletti@caviumnetworks.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/8250.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 303272af386..8e28750a405 100644 --- a/drivers/serial/8250.c +++ b/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; } |