From 351a7e58b6f2903ce555015fe2935efe2ab3e358 Mon Sep 17 00:00:00 2001 From: Julian Calaby Date: Fri, 3 Dec 2010 17:56:45 +0000 Subject: [PATCH] --- yaml --- r: 225709 b: refs/heads/master c: 154337688bfa970453836e65a27de011aba55331 h: refs/heads/master i: 225707: e73617c86077eea0c58b7ad7c37995a4729a9c33 v: v3 --- [refs] | 2 +- trunk/arch/sparc/prom/console_32.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 042300d32198..ab24401cf630 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23bcbf1b63350ed529f7dfb8a5c459e6e0c1a3ca +refs/heads/master: 154337688bfa970453836e65a27de011aba55331 diff --git a/trunk/arch/sparc/prom/console_32.c b/trunk/arch/sparc/prom/console_32.c index 48863108a44c..b05e3db5fa63 100644 --- a/trunk/arch/sparc/prom/console_32.c +++ b/trunk/arch/sparc/prom/console_32.c @@ -27,13 +27,14 @@ static int prom_nbputchar(const char *buf) spin_lock_irqsave(&prom_lock, flags); switch(prom_vers) { case PROM_V0: - i = (*(romvec->pv_nbputchar))(*buf); + if ((*(romvec->pv_nbputchar))(*buf)) + i = 1; break; case PROM_V2: case PROM_V3: if ((*(romvec->pv_v2devops).v2_dev_write)(*romvec->pv_v2bootargs.fd_stdout, buf, 0x1) == 1) - i = 0; + i = 1; break; default: break; @@ -47,7 +48,7 @@ void prom_console_write_buf(const char *buf, int len) { while (len) { int n = prom_nbputchar(buf); - if (n) + if (n < 0) continue; len--; buf++;