---

yaml --- r: 319819 b: refs/heads/master c: 02e2b12 h: refs/heads/master i: 319817: f57aef5 319815: dfd4ec7 v: v3
git-mirror · Jul 30, 2012 · 5ff799a · 5ff799a
1 parent fe591b4
commit 5ff799a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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))) {