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

Commit 4f6e24ed authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Rusty Russell
Browse files

virtio_console: init work unconditionally 



when multiport is off, we don't initialize config work,
but we then cancel uninitialized control_work on freeze.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Cc: stable@kernel.org
parent 6587457b

drivers/char/virtio_console.c

+2 −1
Original line number Diff line number Diff line
@@ -2040,12 +2040,13 @@ static int virtcons_probe(struct virtio_device *vdev) 


	virtio_device_ready(portdev->vdev);



	INIT_WORK(&portdev->control_work, &control_work_handler);



	if (multiport) {

		unsigned int nr_added_bufs;



		spin_lock_init(&portdev->c_ivq_lock);

		spin_lock_init(&portdev->c_ovq_lock);

		INIT_WORK(&portdev->control_work, &control_work_handler);



		nr_added_bufs = fill_queue(portdev->c_ivq,

					   &portdev->c_ivq_lock);