From 1c0f926340b3cf8ad1f36abe9045e29b38456ef9 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 13 Nov 2008 17:46:06 +0900 Subject: [PATCH] --- yaml --- r: 119047 b: refs/heads/master c: 272966c070237c8cb540fe67e06df51bc6ea9cc2 h: refs/heads/master i: 119045: 242dc88f341c29423d9aefce6ae42748fe49e179 119043: be53f13a6bd2676f5d7db70f0363028909528a64 119039: 45ddee2e644555227a7b74ff50121e1c3447b7ef v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/early_printk.c | 2 +- trunk/drivers/serial/sh-sci.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index da78757af6f4..b19ce229db0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d52013cbb3d39bde9f5a6023193058eeb112e98 +refs/heads/master: 272966c070237c8cb540fe67e06df51bc6ea9cc2 diff --git a/trunk/arch/sh/kernel/early_printk.c b/trunk/arch/sh/kernel/early_printk.c index 98a29a782301..a952dcf9999d 100644 --- a/trunk/arch/sh/kernel/early_printk.c +++ b/trunk/arch/sh/kernel/early_printk.c @@ -85,9 +85,9 @@ static void scif_sercon_putc(int c) while (((sci_in(&scif_port, SCFDR) & EPK_FIFO_BITS) >= EPK_FIFO_SIZE)) ; - sci_out(&scif_port, SCxTDR, c); sci_in(&scif_port, SCxSR); sci_out(&scif_port, SCxSR, 0xf3 & ~(0x20 | 0x40)); + sci_out(&scif_port, SCxTDR, c); while ((sci_in(&scif_port, SCxSR) & 0x40) == 0) ; diff --git a/trunk/drivers/serial/sh-sci.c b/trunk/drivers/serial/sh-sci.c index 518c0321e4d3..165fc010978c 100644 --- a/trunk/drivers/serial/sh-sci.c +++ b/trunk/drivers/serial/sh-sci.c @@ -144,9 +144,9 @@ static void put_char(struct uart_port *port, char c) status = sci_in(port, SCxSR); } while (!(status & SCxSR_TDxE(port))); - sci_out(port, SCxTDR, c); sci_in(port, SCxSR); /* Dummy read */ sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port)); + sci_out(port, SCxTDR, c); spin_unlock_irqrestore(&port->lock, flags); }