From 25b3e9ea5d81e87072fe4b50d420a71aecf242d2 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 4 Jan 2006 18:13:03 +0000
Subject: [PATCH] --- yaml --- r: 16732 b: refs/heads/master c:
 50aec3b561de4e435204ad315e5c5ab58ef9feda h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/serial/8250.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a2d4dd7d2b30..98191db4ddd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1624f003349b49050f42c7d9f5407dfc05efb912
+refs/heads/master: 50aec3b561de4e435204ad315e5c5ab58ef9feda
diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c
index 076bf848e4d1..ad20d2dd85d7 100644
--- a/trunk/drivers/serial/8250.c
+++ b/trunk/drivers/serial/8250.c
@@ -2299,9 +2299,7 @@ static int __init find_port(struct uart_port *p)
 
 	for (line = 0; line < UART_NR; line++) {
 		port = &serial8250_ports[line].port;
-		if (p->iotype == port->iotype &&
-		    p->iobase == port->iobase &&
-		    p->membase == port->membase)
+		if (uart_match_port(p, port))
 			return line;
 	}
 	return -ENODEV;