Skip to contentSkip to conversation

8250: Don't clobber spinlocks in 8250.

PATCH New David Daney 1 participant 1 message Oct 15, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 8250: Don't clobber spinlocks in 8250.

Don't clobber spinlocks in 8250.

In serial8250_isa_init_ports(), the port's lock is initialized. We should not overwrite it. Only copy in the fields we need.

---
drivers/serial/8250.c | 16 ++++++++++++++--

1 files changed, 14 insertions(+), 2 deletions(-)
drivers/serial/8250.c +0 -0
index d3ca7d3..da65fea 100644
@@ -2699,12 +2699,24 @@ 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;
+	p->ops		= &serial8250_pops;
	return 0;
}