lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] tty3270: fix put_char fail/success conversion.

Browse Source 
The wrong function got coverted ;)

  CC      drivers/s390/char/tty3270.o
drivers/s390/char/tty3270.c:1747:
 warning: initialization from incompatible pointer type

Acked-by: Alan Cox <alan@redhat.com>
Cc: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens
2008-05-07 09:22:58 +02:00
committed by Martin Schwidefsky
parent b499d76bfd
commit 74c76c8457
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/s390/char/tty3270.c
View File

@@ -965,8 +965,7 @@ tty3270_write_room(struct tty_struct *tty)
* Insert character into the screen at the current position with the * Insert character into the screen at the current position with the
* current color and highlight. This function does NOT do cursor movement. * current color and highlight. This function does NOT do cursor movement.
*/ */
static int static void tty3270_put_character(struct tty3270 *tp, char ch)
tty3270_put_character(struct tty3270 *tp, char ch)
{ {
struct tty3270_line *line; struct tty3270_line *line;
struct tty3270_cell *cell; struct tty3270_cell *cell;
@@ -986,7 +985,6 @@ tty3270_put_character(struct tty3270 *tp, char ch)
cell->character = tp->view.ascebc[(unsigned int) ch]; cell->character = tp->view.ascebc[(unsigned int) ch];
cell->highlight = tp->highlight; cell->highlight = tp->highlight;
cell->f_color = tp->f_color; cell->f_color = tp->f_color;
return 1;
} }
/* /*
@@ -1612,16 +1610,15 @@ tty3270_write(struct tty_struct * tty,
/* /*
* Put single characters to the ttys character buffer * Put single characters to the ttys character buffer
*/ */
static void static int tty3270_put_char(struct tty_struct *tty, unsigned char ch)
tty3270_put_char(struct tty_struct *tty, unsigned char ch)
{ {
struct tty3270 *tp; struct tty3270 *tp;
tp = tty->driver_data; tp = tty->driver_data;
if (!tp) if (!tp || tp->char_count >= TTY3270_CHAR_BUF_SIZE)
return; return 0;
if (tp->char_count < TTY3270_CHAR_BUF_SIZE)
tp->char_buf[tp->char_count++] = ch; tp->char_buf[tp->char_count++] = ch;
return 1;
} }
/* /*