diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-08-11 14:03:08 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-08-11 14:03:08 +0100 |
| commit | b775e642bf958a02210ac4d4edd1a1b7067c49fa (patch) | |
| tree | a3425ead7b2738e6a05249a3c3667d1069782330 /drivers/tty/serial/serial_core.c | |
| parent | 32147e9a8ea54f2ec9914edeede8a9d9dc02e886 (diff) | |
| parent | ccdb8ed3b3c739fe99a6f2f474f7ffad3203485d (diff) | |
| download | talos-op-linux-b775e642bf958a02210ac4d4edd1a1b7067c49fa.tar.gz talos-op-linux-b775e642bf958a02210ac4d4edd1a1b7067c49fa.zip | |
Merge branch 'devicetree/next-console' into devicetree/next
Diffstat (limited to 'drivers/tty/serial/serial_core.c')
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index fbf6c5ad222f..3ce68f962c92 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -26,6 +26,7 @@ #include <linux/slab.h> #include <linux/init.h> #include <linux/console.h> +#include <linux/of.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/device.h> @@ -2615,6 +2616,8 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport) spin_lock_init(&uport->lock); lockdep_set_class(&uport->lock, &port_lock_key); } + if (uport->cons && uport->dev) + of_console_check(uport->dev->of_node, uport->cons->name, uport->line); uart_configure_port(drv, state, uport); |
