From d75f23a59ad674060c56a0fe3be6df636eeae119 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Thu, 2 Sep 2010 18:11:42 +0530 Subject: [PATCH] --- yaml --- r: 211644 b: refs/heads/master c: 84ec06c59a14d0941dd58ca6793b24a7e86b3b85 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/virtio_console.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e4f4642e307a..5dabd59bb9c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96eb872b2a041b1536ccc6ae2fa87eb28f6e2bb2 +refs/heads/master: 84ec06c59a14d0941dd58ca6793b24a7e86b3b85 diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c index e15dbe72edbf..e1d382b15532 100644 --- a/trunk/drivers/char/virtio_console.c +++ b/trunk/drivers/char/virtio_console.c @@ -410,7 +410,10 @@ static ssize_t __send_control_msg(struct ports_device *portdev, u32 port_id, static ssize_t send_control_msg(struct port *port, unsigned int event, unsigned int value) { - return __send_control_msg(port->portdev, port->id, event, value); + /* Did the port get unplugged before userspace closed it? */ + if (port->portdev) + return __send_control_msg(port->portdev, port->id, event, value); + return 0; } /* Callers must take the port->outvq_lock */