From 33bbbfd9d19bcd98017336d5835bb69c160115ec Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Fri, 9 Nov 2012 14:54:12 +1030
Subject: [PATCH] --- yaml --- r: 335464 b: refs/heads/master c:
 237242bddc99041e15a4ca51b8439657cadaff17 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/virtio/virtio.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 226ae28933e3..b6c43b3d7ee8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6a79af8f3701b5a0df431a76adee212616154dc
+refs/heads/master: 237242bddc99041e15a4ca51b8439657cadaff17
diff --git a/trunk/drivers/virtio/virtio.c b/trunk/drivers/virtio/virtio.c
index 1e8659ca27ef..809b0de59c09 100644
--- a/trunk/drivers/virtio/virtio.c
+++ b/trunk/drivers/virtio/virtio.c
@@ -225,8 +225,10 @@ EXPORT_SYMBOL_GPL(register_virtio_device);
 
 void unregister_virtio_device(struct virtio_device *dev)
 {
+	int index = dev->index; /* save for after device release */
+
 	device_unregister(&dev->dev);
-	ida_simple_remove(&virtio_index_ida, dev->index);
+	ida_simple_remove(&virtio_index_ida, index);
 }
 EXPORT_SYMBOL_GPL(unregister_virtio_device);