diff options
author | Julian Calaby <julian.calaby@gmail.com> | 2010-12-03 12:56:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-12 17:50:42 -0500 |
commit | 154337688bfa970453836e65a27de011aba55331 (patch) | |
tree | 2844fbe712396b9e710ed681c7f43d7e6668f5f1 /arch/sparc | |
parent | 23bcbf1b63350ed529f7dfb8a5c459e6e0c1a3ca (diff) |
sparc: prom: Sanitize return value from prom_nbputchar()
Signed-off-by: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/prom/console_32.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sparc/prom/console_32.c b/arch/sparc/prom/console_32.c index 48863108a44c..b05e3db5fa63 100644 --- 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) | |||
27 | spin_lock_irqsave(&prom_lock, flags); | 27 | spin_lock_irqsave(&prom_lock, flags); |
28 | switch(prom_vers) { | 28 | switch(prom_vers) { |
29 | case PROM_V0: | 29 | case PROM_V0: |
30 | i = (*(romvec->pv_nbputchar))(*buf); | 30 | if ((*(romvec->pv_nbputchar))(*buf)) |
31 | i = 1; | ||
31 | break; | 32 | break; |
32 | case PROM_V2: | 33 | case PROM_V2: |
33 | case PROM_V3: | 34 | case PROM_V3: |
34 | if ((*(romvec->pv_v2devops).v2_dev_write)(*romvec->pv_v2bootargs.fd_stdout, | 35 | if ((*(romvec->pv_v2devops).v2_dev_write)(*romvec->pv_v2bootargs.fd_stdout, |
35 | buf, 0x1) == 1) | 36 | buf, 0x1) == 1) |
36 | i = 0; | 37 | i = 1; |
37 | break; | 38 | break; |
38 | default: | 39 | default: |
39 | break; | 40 | break; |
@@ -47,7 +48,7 @@ void prom_console_write_buf(const char *buf, int len) | |||
47 | { | 48 | { |
48 | while (len) { | 49 | while (len) { |
49 | int n = prom_nbputchar(buf); | 50 | int n = prom_nbputchar(buf); |
50 | if (n) | 51 | if (n < 0) |
51 | continue; | 52 | continue; |
52 | len--; | 53 | len--; |
53 | buf++; | 54 | buf++; |