summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/console.c6
-rw-r--r--common/env.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/common/console.c b/common/console.c
index c97a4f41e5..5036c26e1a 100644
--- a/common/console.c
+++ b/common/console.c
@@ -120,10 +120,14 @@ postcore_initcall(getc_buffer_flush);
int console_register(struct console_device *newcdev)
{
- struct device_d *dev = newcdev->dev;
+ struct device_d *dev = &newcdev->class_dev;
int first = 0;
char ch;
+ strcpy(dev->name, "cs");
+ dev->type_data = newcdev->dev->type_data;
+ register_device(dev);
+
if (newcdev->setbrg) {
newcdev->baudrate_param.set = console_baudrate_set;
newcdev->baudrate_param.name = "baudrate";
diff --git a/common/env.c b/common/env.c
index 04ca275d44..edaf388956 100644
--- a/common/env.c
+++ b/common/env.c
@@ -142,7 +142,7 @@ const char *getenv (const char *name)
char *par = strchr(devstr, '.');
struct device_d *dev;
*par = 0;
- dev = get_device_by_id(devstr);
+ dev = get_device_by_name(devstr);
if (dev) {
par++;
ret = dev_get_param(dev, par);
@@ -213,7 +213,7 @@ int setenv(const char *_name, const char *value)
struct device_d *dev;
*par++ = 0;
- dev = get_device_by_id(name);
+ dev = get_device_by_name(name);
if (dev)
ret = dev_set_param(dev, par, value);
else