Commit 0b39fb19 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Sasha Levin

virtio_console: init work unconditionally

[ Upstream commit 4f6e24ed ]

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
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 5850222d
...@@ -2026,12 +2026,13 @@ static int virtcons_probe(struct virtio_device *vdev) ...@@ -2026,12 +2026,13 @@ static int virtcons_probe(struct virtio_device *vdev)
virtio_device_ready(portdev->vdev); virtio_device_ready(portdev->vdev);
INIT_WORK(&portdev->control_work, &control_work_handler);
if (multiport) { if (multiport) {
unsigned int nr_added_bufs; unsigned int nr_added_bufs;
spin_lock_init(&portdev->c_ivq_lock); spin_lock_init(&portdev->c_ivq_lock);
spin_lock_init(&portdev->c_ovq_lock); spin_lock_init(&portdev->c_ovq_lock);
INIT_WORK(&portdev->control_work, &control_work_handler);
nr_added_bufs = fill_queue(portdev->c_ivq, nr_added_bufs = fill_queue(portdev->c_ivq,
&portdev->c_ivq_lock); &portdev->c_ivq_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment