diff options
| -rw-r--r-- | drivers/serial/sunsu.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 4868b318e55e..4ee4167c662f 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
| @@ -1409,6 +1409,7 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m | |||
| 1409 | struct uart_sunsu_port *up; | 1409 | struct uart_sunsu_port *up; |
| 1410 | struct resource *rp; | 1410 | struct resource *rp; |
| 1411 | enum su_type type; | 1411 | enum su_type type; |
| 1412 | bool ignore_line; | ||
| 1412 | int err; | 1413 | int err; |
| 1413 | 1414 | ||
| 1414 | type = su_get_type(dp); | 1415 | type = su_get_type(dp); |
| @@ -1467,9 +1468,14 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m | |||
| 1467 | 1468 | ||
| 1468 | up->port.ops = &sunsu_pops; | 1469 | up->port.ops = &sunsu_pops; |
| 1469 | 1470 | ||
| 1471 | ignore_line = false; | ||
| 1472 | if (!strcmp(dp->name, "rsc-console") || | ||
| 1473 | !strcmp(dp->name, "lom-console")) | ||
| 1474 | ignore_line = true; | ||
| 1475 | |||
| 1470 | sunserial_console_match(SUNSU_CONSOLE(), dp, | 1476 | sunserial_console_match(SUNSU_CONSOLE(), dp, |
| 1471 | &sunsu_reg, up->port.line, | 1477 | &sunsu_reg, up->port.line, |
| 1472 | false); | 1478 | ignore_line); |
| 1473 | err = uart_add_one_port(&sunsu_reg, &up->port); | 1479 | err = uart_add_one_port(&sunsu_reg, &up->port); |
| 1474 | if (err) | 1480 | if (err) |
| 1475 | goto out_unmap; | 1481 | goto out_unmap; |
