From a3d526e53be2539f011a20b08bfa07896306dc5a Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 27 Feb 2013 17:04:06 -0800
Subject: [PATCH] --- yaml --- r: 359333 b: refs/heads/master c:
 62f516b8d6b0610c257b4f92264e00a8dee77a0b h: refs/heads/master i:   359331:
 939a82ed9709ef3f95bb7be0b0772b8f10734502 v: v3

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

diff --git a/[refs] b/[refs]
index 05a7c8b3b1f6..af9b6e5ea626 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37b61890d757f606c25ac5a247572cb7d5efde96
+refs/heads/master: 62f516b8d6b0610c257b4f92264e00a8dee77a0b
diff --git a/trunk/drivers/gpio/gpiolib.c b/trunk/drivers/gpio/gpiolib.c
index 4828fe7c66cb..fff9786cdc64 100644
--- a/trunk/drivers/gpio/gpiolib.c
+++ b/trunk/drivers/gpio/gpiolib.c
@@ -411,15 +411,10 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev,
 			goto err_out;
 		}
 
-		do {
-			ret = -ENOMEM;
-			if (idr_pre_get(&dirent_idr, GFP_KERNEL))
-				ret = idr_get_new_above(&dirent_idr, value_sd,
-							1, &id);
-		} while (ret == -EAGAIN);
-
-		if (ret)
+		ret = idr_alloc(&dirent_idr, value_sd, 1, 0, GFP_KERNEL);
+		if (ret < 0)
 			goto free_sd;
+		id = ret;
 
 		desc->flags &= GPIO_FLAGS_MASK;
 		desc->flags |= (unsigned long)id << ID_SHIFT;