diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-05-30 11:14:13 -0600 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-05-30 11:14:13 +0930 |
| commit | 177dbd95637a52b9118aca757d5856ec3995d3e7 (patch) | |
| tree | 11731b46424543051298d515d8e33d0ae23977c4 /drivers/char | |
| parent | 6917f83ffe5e6b6414ccc845263b792ed201c0f1 (diff) | |
| download | kernel_samsung_smdk4412-177dbd95637a52b9118aca757d5856ec3995d3e7.zip kernel_samsung_smdk4412-177dbd95637a52b9118aca757d5856ec3995d3e7.tar.gz kernel_samsung_smdk4412-177dbd95637a52b9118aca757d5856ec3995d3e7.tar.bz2 | |
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>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/virtio_console.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 838568a..fb68b12 100644 --- a/drivers/char/virtio_console.c +++ b/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); |