2 files changed, 4 insertions, 5 deletions

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 7d2f0b33e5a8..ba8b67039d13 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -587,7 +587,7 @@ out_unlock:
         return count;
 }
 
-const struct file_operations filter_fops = {
+static const struct file_operations filter_fops = {
         .read  = filter_read,
         .write = filter_write,
 };
diff --git a/lib/idr.c b/lib/idr.c
index 1cac726c44bc..ba7d37cf7847 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -140,8 +140,7 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
         id = *starting_id;
  restart:
         p = idp->top;
-        l = idp->layers;
-        pa[l--] = NULL;
+        l = p->layer;
         while (1) {
                 /*
                  * We run around this while until we reach the leaf node...
@@ -155,8 +154,8 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
                         oid = id;
                         id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
 
-                        /* if already at the top layer, we need to grow */
-                        if (!(p = pa[l])) {
+                        /* did id go over the limit? */
+                        if (id >= (1 << (idp->layers * IDR_BITS))) {
                                 *starting_id = id;
                                 return IDR_NEED_TO_GROW;
                         }