diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2015-03-05 10:45:30 +1030 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-03-28 09:36:47 -0400 |
| commit | 0b39fb19628e0f55676ce81e1411c45b7aebf43f (patch) | |
| tree | b70b15ea528d150aa5e63436c402dcf1b601a5bb /drivers/char/virtio_console.c | |
| parent | 5850222dacf683137f7c6a893636daace65e6ad2 (diff) | |
virtio_console: init work unconditionally
[ Upstream commit 4f6e24ed9de8634d6471ef86b382cba6d4e57ca8 ]
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>
Reviewed-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: stable@kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/char/virtio_console.c')
| -rw-r--r-- | drivers/char/virtio_console.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index cf7a561fad7c..9724a6995903 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -2026,12 +2026,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); |