浏览代码

virtio console: don't manually set or finalize VIRTIO_CONSOLE_F_MULTIPORT.

That's already been done by the virtio infrastructure before the probe
function is called.

Reported-by: alexey.kardashevskiy@au1.ibm.com
Acked-by: Amit Shah <amit.shah@redhat.com>
Tested-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell 14 年之前
父节点
当前提交
177dbd9563
共有 1 个文件被更改,包括 0 次插入5 次删除
  1. 0 5
      drivers/char/virtio_console.c

+ 0 - 5
drivers/char/virtio_console.c

@@ -1677,17 +1677,12 @@ static int __devinit virtcons_probe(struct virtio_device *vdev)
 	portdev->config.max_nr_ports = 1;
 	portdev->config.max_nr_ports = 1;
 	if (virtio_has_feature(vdev, VIRTIO_CONSOLE_F_MULTIPORT)) {
 	if (virtio_has_feature(vdev, VIRTIO_CONSOLE_F_MULTIPORT)) {
 		multiport = true;
 		multiport = true;
-		vdev->features[0] |= 1 << VIRTIO_CONSOLE_F_MULTIPORT;
-
 		vdev->config->get(vdev, offsetof(struct virtio_console_config,
 		vdev->config->get(vdev, offsetof(struct virtio_console_config,
 						 max_nr_ports),
 						 max_nr_ports),
 				  &portdev->config.max_nr_ports,
 				  &portdev->config.max_nr_ports,
 				  sizeof(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);
 	err = init_vqs(portdev);
 	if (err < 0) {
 	if (err < 0) {
 		dev_err(&vdev->dev, "Error %d initializing vqs\n", err);
 		dev_err(&vdev->dev, "Error %d initializing vqs\n", err);