diff options
Diffstat (limited to 'drivers/char/mxser.c')
-rw-r--r-- | drivers/char/mxser.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index 83f604b19290..a61fb6da5d03 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c | |||
@@ -321,8 +321,6 @@ struct mxser_struct { | |||
321 | unsigned long event; | 321 | unsigned long event; |
322 | int count; /* # of fd on device */ | 322 | int count; /* # of fd on device */ |
323 | int blocked_open; /* # of blocked opens */ | 323 | int blocked_open; /* # of blocked opens */ |
324 | long session; /* Session of opening process */ | ||
325 | long pgrp; /* pgrp of opening process */ | ||
326 | unsigned char *xmit_buf; | 324 | unsigned char *xmit_buf; |
327 | int xmit_head; | 325 | int xmit_head; |
328 | int xmit_tail; | 326 | int xmit_tail; |
@@ -1001,15 +999,12 @@ static int mxser_open(struct tty_struct *tty, struct file *filp) | |||
1001 | mxser_change_speed(info, NULL); | 999 | mxser_change_speed(info, NULL); |
1002 | } | 1000 | } |
1003 | 1001 | ||
1004 | info->session = process_session(current); | ||
1005 | info->pgrp = process_group(current); | ||
1006 | |||
1007 | /* | 1002 | /* |
1008 | status = mxser_get_msr(info->base, 0, info->port); | 1003 | status = mxser_get_msr(info->base, 0, info->port); |
1009 | mxser_check_modem_status(info, status); | 1004 | mxser_check_modem_status(info, status); |
1010 | */ | 1005 | */ |
1011 | 1006 | ||
1012 | /* unmark here for very high baud rate (ex. 921600 bps) used */ | 1007 | /* unmark here for very high baud rate (ex. 921600 bps) used */ |
1013 | tty->low_latency = 1; | 1008 | tty->low_latency = 1; |
1014 | return 0; | 1009 | return 0; |
1015 | } | 1010 | } |
@@ -1254,9 +1249,7 @@ static void mxser_flush_buffer(struct tty_struct *tty) | |||
1254 | spin_unlock_irqrestore(&info->slock, flags); | 1249 | spin_unlock_irqrestore(&info->slock, flags); |
1255 | /* above added by shinhay */ | 1250 | /* above added by shinhay */ |
1256 | 1251 | ||
1257 | wake_up_interruptible(&tty->write_wait); | 1252 | tty_wakeup(tty); |
1258 | if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && tty->ldisc.write_wakeup) | ||
1259 | (tty->ldisc.write_wakeup) (tty); | ||
1260 | } | 1253 | } |
1261 | 1254 | ||
1262 | static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) | 1255 | static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) |