redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

uml: fix inconsistence due to tty_operation change

Browse source 
'put_char' of 'struct tty_operations' has changed from 'void' into 'int'.
This can also shut up compiler warnings.

Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: WANG Cong <wangcong@zeuux.org>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
WANG Cong 2008-05-06 20:42:33 -07:00 committed by Linus Torvalds
parent cb6969e8cd
commit 3168cb98be
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/um/drivers/line.c
View file

@ -191,9 +191,9 @@ void line_flush_chars(struct tty_struct *tty)
line_flush_buffer(tty); line_flush_buffer(tty);
} }
void line_put_char(struct tty_struct *tty, unsigned char ch) int line_put_char(struct tty_struct *tty, unsigned char ch)
{ {
line_write(tty, &ch, sizeof(ch)); return line_write(tty, &ch, sizeof(ch));
} }
int line_write(struct tty_struct *tty, const unsigned char *buf, int len) int line_write(struct tty_struct *tty, const unsigned char *buf, int len)

2
arch/um/include/line.h
View file

@ -71,7 +71,7 @@ extern int line_setup(struct line *lines, unsigned int sizeof_lines,
char *init, char **error_out); char *init, char **error_out);
extern int line_write(struct tty_struct *tty, const unsigned char *buf, extern int line_write(struct tty_struct *tty, const unsigned char *buf,
int len); int len);
extern void line_put_char(struct tty_struct *tty, unsigned char ch); extern int line_put_char(struct tty_struct *tty, unsigned char ch);
extern void line_set_termios(struct tty_struct *tty, struct ktermios * old); extern void line_set_termios(struct tty_struct *tty, struct ktermios * old);
extern int line_chars_in_buffer(struct tty_struct *tty); extern int line_chars_in_buffer(struct tty_struct *tty);
extern void line_flush_buffer(struct tty_struct *tty); extern void line_flush_buffer(struct tty_struct *tty);