summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGraf Yang2008-04-24 20:55:49 +0200
committerBryan Wu2008-04-24 20:55:49 +0200
commit2ade972996feb8f81d7cf2deaf8321e33770c91a (patch)
tree7b9bae781509a5f843d4cc767dd2d34640be780c /drivers
parentBlackfin Serial Driver: Fix bug - kernel hangs when accessing uart 0 on bf537... (diff)
downloadkernel-qcow2-linux-2ade972996feb8f81d7cf2deaf8321e33770c91a.tar.gz
kernel-qcow2-linux-2ade972996feb8f81d7cf2deaf8321e33770c91a.tar.xz
kernel-qcow2-linux-2ade972996feb8f81d7cf2deaf8321e33770c91a.zip
Blackfin Serial Driver: use BFIN_UART_NR_PORTS to help SIR driver in uart port.
Signed-off-by: Graf Yang <graf.yang@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/bfin_5xx.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index 1dc9b583fa62..8dab6644297c 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -151,7 +151,8 @@ void kgdb_put_debug_char(int chr)
{
struct bfin_serial_port *uart;
- if (CONFIG_KGDB_UART_PORT<0 || CONFIG_KGDB_UART_PORT>=NR_PORTS)
+ if (CONFIG_KGDB_UART_PORT < 0
+ || CONFIG_KGDB_UART_PORT >= BFIN_UART_NR_PORTS)
uart = &bfin_serial_ports[0];
else
uart = &bfin_serial_ports[CONFIG_KGDB_UART_PORT];
@@ -173,7 +174,8 @@ int kgdb_get_debug_char(void)
struct bfin_serial_port *uart;
unsigned char chr;
- if (CONFIG_KGDB_UART_PORT<0 || CONFIG_KGDB_UART_PORT>=NR_PORTS)
+ if (CONFIG_KGDB_UART_PORT < 0
+ || CONFIG_KGDB_UART_PORT >= BFIN_UART_NR_PORTS)
uart = &bfin_serial_ports[0];
else
uart = &bfin_serial_ports[CONFIG_KGDB_UART_PORT];
@@ -1193,7 +1195,7 @@ static struct uart_driver bfin_serial_reg = {
.dev_name = BFIN_SERIAL_NAME,
.major = BFIN_SERIAL_MAJOR,
.minor = BFIN_SERIAL_MINOR,
- .nr = NR_PORTS,
+ .nr = BFIN_UART_NR_PORTS,
.cons = BFIN_SERIAL_CONSOLE,
};