summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-10-25 16:40:59 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-30 22:03:10 +0100
commitd2ffc740f33d432949eee7479ac49bafd9f5108a (patch)
treea895ad5b204efb3336fd5c752e77ae4404da845b /arch/um
parentMerge 3.7-rc3 into tty-next (diff)
downloadlinux-d2ffc740f33d432949eee7479ac49bafd9f5108a.tar.xz
linux-d2ffc740f33d432949eee7479ac49bafd9f5108a.zip
UM: TTY: fix build errors now that tty->raw is gone
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/chan_kern.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index c3bba73e4be6..e9a0abc6a32f 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -83,21 +83,8 @@ static const struct chan_ops not_configged_ops = {
static void tty_receive_char(struct tty_struct *tty, char ch)
{
- if (tty == NULL)
- return;
-
- if (I_IXON(tty) && !I_IXOFF(tty) && !tty->raw) {
- if (ch == STOP_CHAR(tty)) {
- stop_tty(tty);
- return;
- }
- else if (ch == START_CHAR(tty)) {
- start_tty(tty);
- return;
- }
- }
-
- tty_insert_flip_char(tty, ch, TTY_NORMAL);
+ if (tty)
+ tty_insert_flip_char(tty, ch, TTY_NORMAL);
}
static int open_one_chan(struct chan *chan)