diff --git a/[refs] b/[refs]
index 623cb1205c4d..8a72729b8464 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 286f9a226f11e4a05d08999417fd838c0ca91d7a
+refs/heads/master: 291024ef351328e7b4ca6bae798abc816a43653c
diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c
index 10280a29a34b..5397884b6c02 100644
--- a/trunk/drivers/char/virtio_console.c
+++ b/trunk/drivers/char/virtio_console.c
@@ -1393,6 +1393,13 @@ static void handle_control_message(struct ports_device *portdev,
 		send_sigio_to_port(port);
 		break;
 	case VIRTIO_CONSOLE_PORT_NAME:
+		/*
+		 * If we woke up after hibernation, we can get this
+		 * again.  Skip it in that case.
+		 */
+		if (port->name)
+			break;
+
 		/*
 		 * Skip the size of the header and the cpkt to get the size
 		 * of the name that was sent