From: Masahiro Yamada Date: Thu, 23 Oct 2014 13:26:06 +0000 (+0900) Subject: dm: serial: fix console putc X-Git-Tag: v2015.01-rc1~129^2~6 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bac644675ac900e27dc079cf062b55fa71a4c211;p=u-boot dm: serial: fix console putc Commit b8893327e9d2 (dm: serial: Put common code into separate functions) consolidated getc() correctly, but introduced another bug to putc(); serial_stub_putc() passes sdev->priv to serial_putc_dev(), but serial_putc_dev() uses cur_dev instead of the given argument. Signed-off-by: Masahiro Yamada Acked-by: Simon Glass --- diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index c9383dcd00..6b41e0b7b0 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -85,14 +85,14 @@ void serial_initialize(void) static void serial_putc_dev(struct udevice *dev, char ch) { - struct dm_serial_ops *ops = serial_get_ops(cur_dev); + struct dm_serial_ops *ops = serial_get_ops(dev); int err; do { - err = ops->putc(cur_dev, ch); + err = ops->putc(dev, ch); } while (err == -EAGAIN); if (ch == '\n') - serial_putc('\r'); + serial_putc_dev(dev, '\r'); } void serial_putc(char ch)