diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-30 03:54:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:45 -0400 |
commit | 9e7c9a19c1df8a7450c56c41b9c7405eca7eda07 (patch) | |
tree | 8fd3e57dad8f05c7e43969d391bfd33a31738f27 /drivers/s390/char/sclp_tty.c | |
parent | 978e595f88a1fba5869aa42a4af4fba36f33ecac (diff) |
s390 tty: Prepare for put_char to return success/fail
Put the changes into the drivers first. This will still compile/work but
produce a warning if bisected so can still be debugged
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/s390/char/sclp_tty.c')
-rw-r--r-- | drivers/s390/char/sclp_tty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c index e3b3d390b4a3..40b11521cd20 100644 --- a/drivers/s390/char/sclp_tty.c +++ b/drivers/s390/char/sclp_tty.c | |||
@@ -412,14 +412,14 @@ sclp_tty_write(struct tty_struct *tty, const unsigned char *buf, int count) | |||
412 | * - including previous characters from sclp_tty_put_char() and strings from | 412 | * - including previous characters from sclp_tty_put_char() and strings from |
413 | * sclp_write() without final '\n' - will be written. | 413 | * sclp_write() without final '\n' - will be written. |
414 | */ | 414 | */ |
415 | static void | 415 | static int |
416 | sclp_tty_put_char(struct tty_struct *tty, unsigned char ch) | 416 | sclp_tty_put_char(struct tty_struct *tty, unsigned char ch) |
417 | { | 417 | { |
418 | sclp_tty_chars[sclp_tty_chars_count++] = ch; | 418 | sclp_tty_chars[sclp_tty_chars_count++] = ch; |
419 | if (ch == '\n' || sclp_tty_chars_count >= SCLP_TTY_BUF_SIZE) { | 419 | if (ch == '\n' || sclp_tty_chars_count >= SCLP_TTY_BUF_SIZE) { |
420 | sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count); | 420 | sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count); |
421 | sclp_tty_chars_count = 0; | 421 | sclp_tty_chars_count = 0; |
422 | } | 422 | } return 1; |
423 | } | 423 | } |
424 | 424 | ||
425 | /* | 425 | /* |