summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2013-07-29 14:21:32 +0930
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-14 22:59:08 -0700
commit2817b99f91475b84c23cd353741ea485564f4562 (patch)
treed75164fddb07559bba90e491bea2c7df472008f9 /drivers/char
parent707ea94eb328e81dce48e3cdc457e82afb745cf1 (diff)
downloadlinux-3.10-2817b99f91475b84c23cd353741ea485564f4562.tar.gz
linux-3.10-2817b99f91475b84c23cd353741ea485564f4562.tar.bz2
linux-3.10-2817b99f91475b84c23cd353741ea485564f4562.zip
virtio: console: fix raising SIGIO after port unplug
commit 92d3453815fbe74d539c86b60dab39ecdf01bb99 upstream. SIGIO should be sent when a port gets unplugged. It should only be sent to prcesses that have the port opened, and have asked for SIGIO to be delivered. We were clearing out guest_connected before calling send_sigio_to_port(), resulting in a sigio not getting sent to processes. Fix by setting guest_connected to false after invoking the sigio function. Signed-off-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/virtio_console.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 4e684faee10..e4845f1c9a0 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1551,12 +1551,14 @@ static void unplug_port(struct port *port)
spin_unlock_irq(&port->portdev->ports_lock);
if (port->guest_connected) {
+ /* Let the app know the port is going down. */
+ send_sigio_to_port(port);
+
+ /* Do this after sigio is actually sent */
port->guest_connected = false;
port->host_connected = false;
- wake_up_interruptible(&port->waitqueue);
- /* Let the app know the port is going down. */
- send_sigio_to_port(port);
+ wake_up_interruptible(&port->waitqueue);
}
if (is_console_port(port)) {