diff --git a/[refs] b/[refs]
index 5dceec1829f1..d1e9648a365a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9b3febc5b9c55a76b838c977b078195ec8bb95e
+refs/heads/master: 6ace06dc68db13f7f82f9341fdef89502f0bb217
diff --git a/trunk/lib/idr.c b/trunk/lib/idr.c
index ffd61941e75d..d0f1acdbfa3a 100644
--- a/trunk/lib/idr.c
+++ b/trunk/lib/idr.c
@@ -405,7 +405,7 @@ EXPORT_SYMBOL(idr_remove);
  */
 void idr_remove_all(struct idr *idp)
 {
-	int n, id, max, error = 0;
+	int n, id, max;
 	struct idr_layer *p;
 	struct idr_layer *pa[MAX_LEVEL];
 	struct idr_layer **paa = &pa[0];
@@ -415,7 +415,7 @@ void idr_remove_all(struct idr *idp)
 	max = 1 << n;
 
 	id = 0;
-	while (id < max && !error) {
+	while (id < max) {
 		while (n > IDR_BITS && p) {
 			n -= IDR_BITS;
 			*paa++ = p;