2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c
index dfbd5809d744..f8d63d39f592 100644
--- a/drivers/net/mlx4/alloc.c
+++ b/drivers/net/mlx4/alloc.c
@@ -51,8 +51,8 @@ u32 mlx4_bitmap_alloc(struct mlx4_bitmap *bitmap)
 
         if (obj < bitmap->max) {
                 set_bit(obj, bitmap->table);
+                bitmap->last = (obj + 1) & (bitmap->max - 1);
                 obj |= bitmap->top;
-                bitmap->last = obj + 1;
         } else
                 obj = -1;
 
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c
index c42717313663..cfa5cc072339 100644
--- a/drivers/net/mlx4/fw.c
+++ b/drivers/net/mlx4/fw.c
@@ -90,7 +90,7 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u32 flags)
         int i;
 
         mlx4_dbg(dev, "DEV_CAP flags:\n");
-        for (i = 0; i < 32; ++i)
+        for (i = 0; i < ARRAY_SIZE(fname); ++i)
                 if (fname[i] && (flags & (1 << i)))
                         mlx4_dbg(dev, "    %s\n", fname[i]);
 }