diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-17 16:20:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 16:20:14 -0800 |
| commit | 8c2fcadc933f713d51f46ec4dcd9b12830e0df84 (patch) | |
| tree | e0797b2db664d702f9d02dd0f45efddb2f0d7fe9 /drivers/char/nozomi.c | |
| parent | 232486e1e9f34889424b68ee6270440b554479a2 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/char/nozomi.c')
| -rw-r--r-- | drivers/char/nozomi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c index 7d73cd43034..2ad7d37afbd 100644 --- a/drivers/char/nozomi.c +++ b/drivers/char/nozomi.c @@ -1651,10 +1651,10 @@ static void ntty_close(struct tty_struct *tty, struct file *file) dc->open_ttys--; port->count--; - tty_port_tty_set(port, NULL); if (port->count == 0) { DBG1("close: %d", nport->token_dl); + tty_port_tty_set(port, NULL); spin_lock_irqsave(&dc->spin_mutex, flags); dc->last_ier &= ~(nport->token_dl); writew(dc->last_ier, dc->reg_ier); |