From 68311c98ecd519662ed7bfcd3e80f2f188ef53a9 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Fri, 4 Jul 2008 09:59:28 -0700 Subject: [PATCH] --- yaml --- r: 98679 b: refs/heads/master c: 7ca796f492a11f9408e661c8f22cd8c4f486b8e5 h: refs/heads/master i: 98677: 466969869c0041b14823e806407d8e634730120c 98675: f8fa674f2260c8fbdb15775d58f34504f82af3fa 98671: 4ef01b172124c3a7b1b00a7f023ebc76b6d1edea v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_core.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 606b26202659..e19b5dfa17c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69d44a1835ec8163a82c4ee57367f87ae0f85c2e +refs/heads/master: 7ca796f492a11f9408e661c8f22cd8c4f486b8e5 diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c index c9b64e73c987..42d2e108b679 100644 --- a/trunk/drivers/serial/serial_core.c +++ b/trunk/drivers/serial/serial_core.c @@ -1991,7 +1991,9 @@ struct uart_match { static int serial_match_port(struct device *dev, void *data) { struct uart_match *match = data; - dev_t devt = MKDEV(match->driver->major, match->driver->minor) + match->port->line; + struct tty_driver *tty_drv = match->driver->tty_driver; + dev_t devt = MKDEV(tty_drv->major, tty_drv->minor_start) + + match->port->line; return dev->devt == devt; /* Actually, only one tty per port */ }