From b0ec748942956e4d3970700b956398a5fb7a5255 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 27 Feb 2013 17:04:33 -0800
Subject: [PATCH] --- yaml --- r: 359356 b: refs/heads/master c:
 589e9c4dace6995440c119486919ce95b180dd38 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/mtd/mtdcore.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 56cee669e52b..9c54ec66cbfb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 803d9e043dc31ea2d26442618f0eb020550f8e08
+refs/heads/master: 589e9c4dace6995440c119486919ce95b180dd38
diff --git a/trunk/drivers/mtd/mtdcore.c b/trunk/drivers/mtd/mtdcore.c
index ec794a72975d..61d5f56473e1 100644
--- a/trunk/drivers/mtd/mtdcore.c
+++ b/trunk/drivers/mtd/mtdcore.c
@@ -349,13 +349,8 @@ int add_mtd_device(struct mtd_info *mtd)
 	BUG_ON(mtd->writesize == 0);
 	mutex_lock(&mtd_table_mutex);
 
-	do {
-		if (!idr_pre_get(&mtd_idr, GFP_KERNEL))
-			goto fail_locked;
-		error = idr_get_new(&mtd_idr, mtd, &i);
-	} while (error == -EAGAIN);
-
-	if (error)
+	i = idr_alloc(&mtd_idr, mtd, 0, 0, GFP_KERNEL);
+	if (i < 0)
 		goto fail_locked;
 
 	mtd->index = i;