Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[pandora-kernel.git] / arch / sparc / prom / console_32.c

diff --git a/arch/sparc/prom/console_32.c b/arch/sparc/prom/console_32.c
index 4886310..b05e3db 100644 (file)
--- a/arch/sparc/prom/console_32.c
+++ b/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++;