Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 177dbd95 authored by Rusty Russell's avatar Rusty Russell
Browse files

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: default avatar <alexey.kardashevskiy@au1.ibm.com>
Acked-by: default avatarAmit Shah <amit.shah@redhat.com>
Tested-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 6917f83f

drivers/char/virtio_console.c

+0 −5
Original line number Diff line number Diff line
@@ -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);