summaryrefslogtreecommitdiff
path: root/drivers/serial/mux.c
diff options
context:
space:
mode:
authorRyan Bradetich <rbrad@parisc-linux.org>2006-11-03 05:38:39 +0000
committerKyle McMartin <kyle@ubuntu.com>2006-12-08 00:34:05 -0500
commit4bd5d82779466a2969c631ce283bef926680c9f5 (patch)
tree05a71af0da4438f85a03ade6f00a8b457a306b40 /drivers/serial/mux.c
parent075b8783da0db700868c7b391636a85c06a89678 (diff)
downloadlinux-3.10-4bd5d82779466a2969c631ce283bef926680c9f5.tar.gz
linux-3.10-4bd5d82779466a2969c631ce283bef926680c9f5.tar.bz2
linux-3.10-4bd5d82779466a2969c631ce283bef926680c9f5.zip
[PARISC] [MUX] Mux driver bug fix
This patch addresses the problems identified by Russell King in the following email: http://lists.parisc-linux.org/pipermail/parisc-linux/2005-December/027912.html Signed-off-by: Ryan Bradetich <rbrad@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers/serial/mux.c')
-rw-r--r--drivers/serial/mux.c27
1 files changed, 17 insertions, 10 deletions
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
index 8ad1b8c5ec5..ec57a616788 100644
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
@@ -51,7 +51,11 @@
#define MUX_NR 256
static unsigned int port_cnt __read_mostly;
-static struct uart_port mux_ports[MUX_NR];
+struct mux_port {
+ struct uart_port port;
+ int enabled;
+};
+static struct mux_port mux_ports[MUX_NR];
static struct uart_driver mux_driver = {
.owner = THIS_MODULE,
@@ -250,7 +254,7 @@ static void mux_read(struct uart_port *port)
*/
static int mux_startup(struct uart_port *port)
{
- mod_timer(&mux_timer, jiffies + MUX_POLL_DELAY);
+ mux_ports[port->line].enabled = 1;
return 0;
}
@@ -262,6 +266,7 @@ static int mux_startup(struct uart_port *port)
*/
static void mux_shutdown(struct uart_port *port)
{
+ mux_ports[port->line].enabled = 0;
}
/**
@@ -319,7 +324,7 @@ static int mux_request_port(struct uart_port *port)
* @port: Ptr to the uart_port.
* @type: Bitmask of required configurations.
*
- * Perform any autoconfiguration steps for the port. This functino is
+ * Perform any autoconfiguration steps for the port. This function is
* called if the UPF_BOOT_AUTOCONF flag is specified for the port.
* [Note: This is required for now because of a bug in the Serial core.
* rmk has already submitted a patch to linus, should be available for
@@ -357,11 +362,11 @@ static void mux_poll(unsigned long unused)
int i;
for(i = 0; i < port_cnt; ++i) {
- if(!mux_ports[i].info)
+ if(!mux_ports[i].enabled)
continue;
- mux_read(&mux_ports[i]);
- mux_write(&mux_ports[i]);
+ mux_read(&mux_ports[i].port);
+ mux_write(&mux_ports[i].port);
}
mod_timer(&mux_timer, jiffies + MUX_POLL_DELAY);
@@ -456,7 +461,7 @@ static int __init mux_probe(struct parisc_device *dev)
}
for(i = 0; i < ports; ++i, ++port_cnt) {
- port = &mux_ports[port_cnt];
+ port = &mux_ports[port_cnt].port;
port->iobase = 0;
port->mapbase = dev->hpa.start + MUX_OFFSET +
(i * MUX_LINE_OFFSET);
@@ -484,6 +489,8 @@ static int __init mux_probe(struct parisc_device *dev)
#ifdef CONFIG_SERIAL_MUX_CONSOLE
register_console(&mux_console);
#endif
+ mod_timer(&mux_timer, jiffies + MUX_POLL_DELAY);
+
return 0;
}
@@ -520,9 +527,9 @@ static void __exit mux_exit(void)
int i;
for (i = 0; i < port_cnt; i++) {
- uart_remove_one_port(&mux_driver, &mux_ports[i]);
- if (mux_ports[i].membase)
- iounmap(mux_ports[i].membase);
+ uart_remove_one_port(&mux_driver, &mux_ports[i].port);
+ if (mux_ports[i].port.membase)
+ iounmap(mux_ports[i].port.membase);
}
uart_unregister_driver(&mux_driver);