Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 225709
b: refs/heads/master
c: 1543376
h: refs/heads/master
i:
  225707: e73617c
v: v3
  • Loading branch information
Julian Calaby authored and David S. Miller committed Dec 12, 2010
1 parent b34e6d8 commit 351a7e5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 23bcbf1b63350ed529f7dfb8a5c459e6e0c1a3ca
refs/heads/master: 154337688bfa970453836e65a27de011aba55331
7 changes: 4 additions & 3 deletions trunk/arch/sparc/prom/console_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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++;
Expand Down

0 comments on commit 351a7e5

Please sign in to comment.