From: Michael S. Tsirkin Date: Tue, 14 Oct 2014 23:52:32 +0000 (+1030) Subject: virtio_console: enable VQs early on restore X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=401bbdc901b268113d7c562616feb7fc37492aca;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git virtio_console: enable VQs early on restore virtio spec requires drivers to set DRIVER_OK before using VQs. This is set automatically after resume returns, virtio console violated this rule by adding inbufs, which causes the VQ to be used directly within restore. To fix, call virtio_device_ready before using VQs. Signed-off-by: Michael S. Tsirkin Signed-off-by: Rusty Russell --- diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index d0f25bdc7ba5..bfa640023e64 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -2184,6 +2184,8 @@ static int virtcons_restore(struct virtio_device *vdev) if (ret) return ret; + virtio_device_ready(portdev->vdev); + if (use_multiport(portdev)) fill_queue(portdev->c_ivq, &portdev->c_ivq_lock);