From 83fff7861abc512211bab9048b8e2efca45cc51c Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 30 May 2011 11:14:13 -0600
Subject: [PATCH] --- yaml --- r: 252943 b: refs/heads/master c:
 177dbd95637a52b9118aca757d5856ec3995d3e7 h: refs/heads/master i:   252941:
 91010a45799cf974360268c05468e5634f10561f   252939:
 8bac98c098e20350b8ee09ae8baa3c277f0dda5b   252935:
 d76b525252dadde49f087e391e0c42362c962aa5   252927:
 107401c059f98d387849dcfdd8e0c0208f04e086 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/char/virtio_console.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5a004b8aaf14..75a9d7a4c049 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6917f83ffe5e6b6414ccc845263b792ed201c0f1
+refs/heads/master: 177dbd95637a52b9118aca757d5856ec3995d3e7
diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c
index 838568a7dbf5..fb68b1295373 100644
--- a/trunk/drivers/char/virtio_console.c
+++ b/trunk/drivers/char/virtio_console.c
@@ -1677,17 +1677,12 @@ static int __devinit virtcons_probe(struct virtio_device *vdev)
 	portdev->config.max_nr_ports = 1;
 	if (virtio_has_feature(vdev, VIRTIO_CONSOLE_F_MULTIPORT)) {
 		multiport = true;
-		vdev->features[0] |= 1 << VIRTIO_CONSOLE_F_MULTIPORT;
-
 		vdev->config->get(vdev, offsetof(struct virtio_console_config,
 						 max_nr_ports),
 				  &portdev->config.max_nr_ports,
 				  sizeof(portdev->config.max_nr_ports));
 	}
 
-	/* Let the Host know we support multiple ports.*/
-	vdev->config->finalize_features(vdev);
-
 	err = init_vqs(portdev);
 	if (err < 0) {
 		dev_err(&vdev->dev, "Error %d initializing vqs\n", err);