diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 13:16:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 13:16:18 +0100 |
| commit | f8cb22cbb8383c9f41e6ccbcd4fb94edb1048bda (patch) | |
| tree | 9b3a333224ec895c053a694dcaff526502b84e6c /arch/xtensa/platforms/iss/console.c | |
| parent | 044d408409cc4e1bc75c886e27ca85c270db104c (diff) | |
| parent | ebdcc81c71937b30e09110c02a1e8a21fa770b6f (diff) | |
Merge branch 'linus' into irq/genirq
Diffstat (limited to 'arch/xtensa/platforms/iss/console.c')
| -rw-r--r-- | arch/xtensa/platforms/iss/console.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c index efed8897bef..25d46c84eb0 100644 --- a/arch/xtensa/platforms/iss/console.c +++ b/arch/xtensa/platforms/iss/console.c @@ -140,16 +140,14 @@ static void rs_poll(unsigned long priv) } -static void rs_put_char(struct tty_struct *tty, unsigned char ch) +static int rs_put_char(struct tty_struct *tty, unsigned char ch) { char buf[2]; - if (!tty) - return; - buf[0] = ch; buf[1] = '\0'; /* Is this NULL necessary? */ __simc (SYS_write, 1, (unsigned long) buf, 1, 0, 0); + return 1; } static void rs_flush_chars(struct tty_struct *tty) |