diff --git a/[refs] b/[refs] index bd6c98152d61..e6b0b31d51ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bc1a2ef19b45bb23617b203bc631b44609f17ba +refs/heads/master: 02e2b124943648fba0a2ccee5c3656a5653e0151 diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c index 693187df7601..1bed51712dd1 100644 --- a/trunk/drivers/block/virtio_blk.c +++ b/trunk/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))) {