diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:27:20 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:27:20 +0100 |
commit | 5e79364a66e2fdfa2ebfd659dbc3ba47a0ebc680 (patch) | |
tree | 6604f155b58c4bbfbed5c304e4e8b471d8d94a07 /common | |
parent | fe68ba4526ed666a2c3a5ddd84d964dbaae0f2d0 (diff) | |
parent | 94c3370843c529cb48d8cb9e14d83897ed9f750e (diff) | |
download | barebox-5e79364a66e2fdfa2ebfd659dbc3ba47a0ebc680.tar.gz barebox-5e79364a66e2fdfa2ebfd659dbc3ba47a0ebc680.tar.xz |
Merge branch 'for-next/console'
Diffstat (limited to 'common')
-rw-r--r-- | common/console.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/common/console.c b/common/console.c index 84d4ea714d..4a1d2576d0 100644 --- a/common/console.c +++ b/common/console.c @@ -67,12 +67,6 @@ int console_set_active(struct console_device *cdev, unsigned flag) if (!cdev->putc) flag &= ~(CONSOLE_STDOUT | CONSOLE_STDERR); - if (flag && !cdev->f_active) { - /* The device is being activated, set its baudrate */ - if (cdev->setbrg) - cdev->setbrg(cdev, cdev->baudrate); - } - if (!flag && cdev->f_active && cdev->flush) cdev->flush(cdev); @@ -240,7 +234,7 @@ static int __console_puts(struct console_device *cdev, const char *s) int console_register(struct console_device *newcdev) { struct device_d *dev = &newcdev->class_dev; - int activate = 0; + int activate = 0, ret; if (initialized == CONSOLE_UNINITIALIZED) console_init_early(); @@ -258,6 +252,9 @@ int console_register(struct console_device *newcdev) platform_device_register(dev); if (newcdev->setbrg) { + ret = newcdev->setbrg(newcdev, CONFIG_BAUDRATE); + if (ret) + return ret; newcdev->baudrate = CONFIG_BAUDRATE; dev_add_param_int(dev, "baudrate", console_baudrate_set, NULL, &newcdev->baudrate_param, "%u", newcdev); |