From: Amit Shah <amit.shah@redhat.com>
Date: Thu, 2 Sep 2010 12:41:40 +0000 (+0530)
Subject: virtio: console: Reset vdev before removing device
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=02238959944ce031f066f21e541a14933aca6575;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

virtio: console: Reset vdev before removing device

The virtqueues should be disabled before attempting to remove the
device.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 0f69c5ec0ecd..076d0358cf0e 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1605,6 +1605,9 @@ static void virtcons_remove(struct virtio_device *vdev)
 
 	portdev = vdev->priv;
 
+	/* Disable interrupts for vqs */
+	vdev->config->reset(vdev);
+	/* Finish up work that's lined up */
 	cancel_work_sync(&portdev->control_work);
 
 	list_for_each_entry_safe(port, port2, &portdev->ports, list)