diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-01-04 13:09:44 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-04 13:09:44 -0500 |
commit | 1624f003349b49050f42c7d9f5407dfc05efb912 (patch) | |
tree | 43fef7650e2bb7832222956b0dc46e6b48e74b8c /drivers/serial | |
parent | 26e92861be9c0da3be30718de693976b3f6a8026 (diff) |
[SERIAL] Fix matching of MMIO ports
The function uart_match_port() incorrectly compares the ioremap'd
virtual addresses of ports instead of the physical address to find
duplicate ports for MMIO based UARTs. This fixes it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/serial_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index c17d680e3f04..34c576dfad8d 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c | |||
@@ -2307,7 +2307,7 @@ int uart_match_port(struct uart_port *port1, struct uart_port *port2) | |||
2307 | return (port1->iobase == port2->iobase) && | 2307 | return (port1->iobase == port2->iobase) && |
2308 | (port1->hub6 == port2->hub6); | 2308 | (port1->hub6 == port2->hub6); |
2309 | case UPIO_MEM: | 2309 | case UPIO_MEM: |
2310 | return (port1->membase == port2->membase); | 2310 | return (port1->mapbase == port2->mapbase); |
2311 | } | 2311 | } |
2312 | return 0; | 2312 | return 0; |
2313 | } | 2313 | } |