[PATCH] virtio_console: init work unconditionally
STALE4232d
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: 2015-02-28 17:41:53
Also in:
lkml
Subsystem:
char and misc drivers, the rest, virtio console driver · Maintainers:
Arnd Bergmann, Greg Kroah-Hartman, Linus Torvalds, Amit Shah
when multiport is off, we don't initialize config work, but we then cancel uninitialized control_work on freeze. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- drivers/char/virtio_console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index fae2dbb..def736d 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c@@ -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);
--
MST