From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 4 Jan 2006 18:09:44 +0000 (+0000)
Subject: [SERIAL] Fix matching of MMIO ports
X-Git-Tag: v2.6.16.28-rc1~2289^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1624f003349b49050f42c7d9f5407dfc05efb912;p=karo-tx-linux.git

[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>
---

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)
 		return (port1->iobase == port2->iobase) &&
 		       (port1->hub6   == port2->hub6);
 	case UPIO_MEM:
-		return (port1->membase == port2->membase);
+		return (port1->mapbase == port2->mapbase);
 	}
 	return 0;
 }