Console: Fix baudrate switching

When waiting for the user to confirm the new baudrate, wait
for '\n' and '\r' instead of only '\r'

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

1 files changed, 4 insertions, 1 deletions

diff --git a/common/console.c b/common/console.c
index 7a94f57392..de487fc140 100644
--- a/common/console.c
+++ b/common/console.c
@@ -85,6 +85,7 @@ static int console_baudrate_set(struct device_d *dev, struct param_d *param,
 {
 	struct console_device *cdev = dev->type_data;
 	int baudrate;
+	unsigned char c;
 
 	baudrate = simple_strtoul(val, NULL, 10);
 
@@ -94,7 +95,9 @@ static int console_baudrate_set(struct device_d *dev, struct param_d *param,
 		mdelay(50);
 		cdev->setbrg(cdev, baudrate);
 		mdelay(50);
-		while (getc() != '\r');
+		do {
+			c = getc();
+		} while (c != '\r' && c != '\n');
 	} else
 		cdev->setbrg(cdev, baudrate);