From f2fed80353107c6ad27f103ce91b767af7eb99e1 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Wed, 14 Sep 2011 13:06:40 +0530 Subject: [PATCH] --- yaml --- r: 273207 b: refs/heads/master c: 291024ef351328e7b4ca6bae798abc816a43653c h: refs/heads/master i: 273205: 46151890dbb7b583cc47855c08bb924523475d02 273203: c87ad5ef6423f22f50533909d646637b79abf9b2 273199: 62f1ff1e18b911651502364dda66f8ca8497b71b v: v3 --- [refs] | 2 +- trunk/drivers/char/virtio_console.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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