Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74c76c84 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

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



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: default avatarAlan Cox <alan@redhat.com>
Cc: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent b499d76b

drivers/s390/char/tty3270.c

+6 −9
Original line number Diff line number Diff line
@@ -965,8 +965,7 @@ tty3270_write_room(struct tty_struct *tty) 
 * Insert character into the screen at the current position with the

 * current color and highlight. This function does NOT do cursor movement.

 */

static int

tty3270_put_character(struct tty3270 *tp, char ch)

static void tty3270_put_character(struct tty3270 *tp, char ch)

{

	struct tty3270_line *line;

	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->highlight = tp->highlight;

	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

 */

static void

tty3270_put_char(struct tty_struct *tty, unsigned char ch)

static int tty3270_put_char(struct tty_struct *tty, unsigned char ch)

{

	struct tty3270 *tp;



	tp = tty->driver_data;

	if (!tp)

		return;

	if (tp->char_count < TTY3270_CHAR_BUF_SIZE)

	if (!tp || tp->char_count >= TTY3270_CHAR_BUF_SIZE)

		return 0;

	tp->char_buf[tp->char_count++] = ch;

	return 1;

}



/*