diff --git a/common/console.c b/common/console.c
index 84d4ea7..4a1d257 100644
--- a/common/console.c
+++ b/common/console.c
@@ -67,12 +67,6 @@
 	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 @@
 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 @@
 	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);