From 6b4affaf696aea33090ed2d216dab53db4efde6a Mon Sep 17 00:00:00 2001
From: Amit Shah <amit.shah@redhat.com>
Date: Fri, 19 Mar 2010 17:36:44 +0530
Subject: [PATCH] --- yaml --- r: 188892 b: refs/heads/master c:
 2de16a493cc6153f7fa0b9da12a3862d063e3425 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/char/virtio_console.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6c3aa2eb1e6e..ce82c1e0aa32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec64213c4d482ee4d15b34511441eaecdd002adf
+refs/heads/master: 2de16a493cc6153f7fa0b9da12a3862d063e3425
diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c
index 67b474b4167c..44288ce0cb45 100644
--- a/trunk/drivers/char/virtio_console.c
+++ b/trunk/drivers/char/virtio_console.c
@@ -681,6 +681,10 @@ static void resize_console(struct port *port)
 	struct virtio_device *vdev;
 	struct winsize ws;
 
+	/* The port could have been hot-unplugged */
+	if (!port)
+		return;
+
 	vdev = port->portdev->vdev;
 	if (virtio_has_feature(vdev, VIRTIO_CONSOLE_F_SIZE)) {
 		vdev->config->get(vdev,