virtio-blk: Call del_gendisk() before disable guest kick

[deliverable/linux.git] / drivers / block / virtio_blk.c

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 693187df76012e1ace1f3c9b58fd4e78d6ec3aab..1bed51712dd1a435a8aa76449dca7d12ed80af98 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -584,13 +584,13 @@ static void __devexit virtblk_remove(struct virtio_device *vdev)
        vblk->config_enable = false;
        mutex_unlock(&vblk->config_lock);
 
+       del_gendisk(vblk->disk);
+
        /* Stop all the virtqueues. */
        vdev->config->reset(vdev);
 
        flush_work(&vblk->config_work);
 
-       del_gendisk(vblk->disk);
-
        /* Abort requests dispatched to driver. */
        spin_lock_irqsave(&vblk->lock, flags);
        while ((vbr = virtqueue_detach_unused_buf(vblk->vq))) {