diff --git a/[refs] b/[refs]
index ca5ca8c7a299..9696f41b13b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4028119714e452f9b49377ec55e0ed1e5d1dfa4
+refs/heads/master: 7a2853178dfba9553d58f356113f47fd582e9cc6
diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c
index 70f1c38fa14c..21b621343033 100644
--- a/trunk/drivers/char/virtio_console.c
+++ b/trunk/drivers/char/virtio_console.c
@@ -1131,7 +1131,7 @@ static int add_port(struct ports_device *portdev, u32 id)
 }
 
 /* Remove all port-specific data. */
-static int remove_port(struct port *port)
+static void remove_port(struct port *port)
 {
 	struct port_buffer *buf;
 
@@ -1181,7 +1181,6 @@ static int remove_port(struct port *port)
 	debugfs_remove(port->debugfs_file);
 
 	kfree(port);
-	return 0;
 }
 
 /* Any private messages that the Host and Guest want to share */