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

Commit b23dc5a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull virtio bugfix from Michael S Tsirkin:
 "This fixes a crash in virtio console multi-channel mode that got
  introduced in -rc1"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_console: move early VQ enablement
parents 5cf52037 65eca3a2

drivers/char/virtio_console.c

+2 −2
Original line number Diff line number Diff line
@@ -1449,8 +1449,6 @@ static int add_port(struct ports_device *portdev, u32 id) 
	spin_lock_init(&port->outvq_lock);

	init_waitqueue_head(&port->waitqueue);



	virtio_device_ready(portdev->vdev);



	/* Fill the in_vq with buffers so the host can send us data. */

	nr_added_bufs = fill_queue(port->in_vq, &port->inbuf_lock);

	if (!nr_added_bufs) {
@@ -2026,6 +2024,8 @@ static int virtcons_probe(struct virtio_device *vdev) 
	spin_lock_init(&portdev->ports_lock);

	INIT_LIST_HEAD(&portdev->ports);



	virtio_device_ready(portdev->vdev);



	if (multiport) {

		unsigned int nr_added_bufs;