---

yaml
---
r: 211643
b: refs/heads/master
c: 96eb872
h: refs/heads/master
i:
  211641: 1d22aec
  211639: ad7ff58
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02238959944ce031f066f21e541a14933aca6575
+refs/heads/master: 96eb872b2a041b1536ccc6ae2fa87eb28f6e2bb2

trunk/drivers/char/virtio_console.c

@@ -1600,8 +1600,6 @@ static void virtcons_remove(struct virtio_device *vdev)
 {
 	struct ports_device *portdev;
 	struct port *port, *port2;
-	struct port_buffer *buf;
-	unsigned int len;
 
 	portdev = vdev->priv;
 
@@ -1615,11 +1613,16 @@ static void virtcons_remove(struct virtio_device *vdev)
 
 	unregister_chrdev(portdev->chr_major, "virtio-portsdev");
 
-	while ((buf = virtqueue_get_buf(portdev->c_ivq, &len)))
-		free_buf(buf);
+	if (use_multiport(portdev)) {
+		struct port_buffer *buf;
+		unsigned int len;
 
-	while ((buf = virtqueue_detach_unused_buf(portdev->c_ivq)))
-		free_buf(buf);
+		while ((buf = virtqueue_get_buf(portdev->c_ivq, &len)))
+			free_buf(buf);
+
+		while ((buf = virtqueue_detach_unused_buf(portdev->c_ivq)))
+			free_buf(buf);
+	}
 
 	vdev->config->del_vqs(vdev);
 	kfree(portdev->in_vqs);