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/con3215.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/con3215.c')
-rw-r--r-- | drivers/s390/char/con3215.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index 0e1f35c9ed9d..3e5653c92f4b 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c | |||
@@ -982,15 +982,16 @@ tty3215_write(struct tty_struct * tty, | |||
982 | /* | 982 | /* |
983 | * Put character routine for 3215 ttys | 983 | * Put character routine for 3215 ttys |
984 | */ | 984 | */ |
985 | static void | 985 | static int |
986 | tty3215_put_char(struct tty_struct *tty, unsigned char ch) | 986 | tty3215_put_char(struct tty_struct *tty, unsigned char ch) |
987 | { | 987 | { |
988 | struct raw3215_info *raw; | 988 | struct raw3215_info *raw; |
989 | 989 | ||
990 | if (!tty) | 990 | if (!tty) |
991 | return; | 991 | return 0; |
992 | raw = (struct raw3215_info *) tty->driver_data; | 992 | raw = (struct raw3215_info *) tty->driver_data; |
993 | raw3215_putchar(raw, ch); | 993 | raw3215_putchar(raw, ch); |
994 | return 1; | ||
994 | } | 995 | } |
995 | 996 | ||
996 | static void | 997 | static void |