diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 09:36:25 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 09:36:25 -0400 |
| commit | a8931ef380c92d121ae74ecfb03b2d63f72eea6f (patch) | |
| tree | 980fb6b019e11e6cb1ece55b7faff184721a8053 /drivers/serial/crisv10.c | |
| parent | 90574d0a4d4b73308ae54a2a57a4f3f1fa98e984 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/serial/crisv10.c')
| -rw-r--r-- | drivers/serial/crisv10.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index f9fa237aa949..3e0366eab412 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c | |||
| @@ -3808,7 +3808,7 @@ rs_close(struct tty_struct *tty, struct file * filp) | |||
| 3808 | 3808 | ||
| 3809 | shutdown(info); | 3809 | shutdown(info); |
| 3810 | rs_flush_buffer(tty); | 3810 | rs_flush_buffer(tty); |
| 3811 | tty_ldisc_flush_buffer(tty); | 3811 | tty_ldisc_flush(tty); |
| 3812 | tty->closing = 0; | 3812 | tty->closing = 0; |
| 3813 | info->event = 0; | 3813 | info->event = 0; |
| 3814 | info->tty = 0; | 3814 | info->tty = 0; |