diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2012-11-16 18:26:00 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2012-11-16 18:26:00 -0800 |
| commit | 1e619a1bf9ac878e6a984e4e279ccf712a65bc23 (patch) | |
| tree | 1d5cfb16f88e36dca2f57386dd4a585a63f15287 /drivers/tty/hvc | |
| parent | staging: Add SystemBase Multi-2/PCI driver (diff) | |
| parent | Linux 3.7-rc6 (diff) | |
| download | linux-1e619a1bf9ac878e6a984e4e279ccf712a65bc23.tar.gz linux-1e619a1bf9ac878e6a984e4e279ccf712a65bc23.tar.bz2 linux-1e619a1bf9ac878e6a984e4e279ccf712a65bc23.zip | |
Merge 3.7-rc6 into tty-next
Diffstat (limited to 'drivers/tty/hvc')
| -rw-r--r-- | drivers/tty/hvc/hvc_console.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c index a5dec1ca1b82..13ee53bd0bf6 100644 --- a/drivers/tty/hvc/hvc_console.c +++ b/drivers/tty/hvc/hvc_console.c @@ -424,7 +424,6 @@ static void hvc_hangup(struct tty_struct *tty) { struct hvc_struct *hp = tty->driver_data; unsigned long flags; - int temp_open_count; if (!hp) return; @@ -444,7 +443,6 @@ static void hvc_hangup(struct tty_struct *tty) return; } - temp_open_count = hp->port.count; hp->port.count = 0; spin_unlock_irqrestore(&hp->port.lock, flags); tty_port_tty_set(&hp->port, NULL); @@ -453,11 +451,6 @@ static void hvc_hangup(struct tty_struct *tty) if (hp->ops->notifier_hangup) hp->ops->notifier_hangup(hp, hp->data); - - while(temp_open_count) { - --temp_open_count; - tty_port_put(&hp->port); - } } /* |