diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-09 17:38:27 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-09 17:38:27 +0100 |
| commit | b396f385967a00e801559593f18e30a8617dcf69 (patch) | |
| tree | 92c8e2f5c3cfcb20503b68ef0f8d0bc5181f9244 /common | |
| parent | 39c6c3480a9cb88e722af1142c7b31a00e9ec546 (diff) | |
| parent | f648eb9e65bbdbb460ea3eaf548b3ba3f3373307 (diff) | |
| download | barebox-b396f385967a00e801559593f18e30a8617dcf69.tar.gz barebox-b396f385967a00e801559593f18e30a8617dcf69.tar.xz | |
Merge branch 'for-next/netconsole'
Diffstat (limited to 'common')
| -rw-r--r-- | common/console.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/common/console.c b/common/console.c index e5f4267cbd..c092621aa1 100644 --- a/common/console.c +++ b/common/console.c @@ -64,6 +64,7 @@ static int console_std_set(struct device_d *dev, struct param_d *param, struct console_device *cdev = to_console_dev(dev); char active[4]; unsigned int flag = 0, i = 0; + int ret; if (val) { if (strchr(val, 'i') && cdev->getc) { @@ -90,6 +91,12 @@ static int console_std_set(struct device_d *dev, struct param_d *param, cdev->setbrg(cdev, cdev->baudrate); } + if (cdev->set_active) { + ret = cdev->set_active(cdev, flag); + if (ret) + return ret; + } + active[i] = 0; cdev->f_active = flag; |