2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 98281fe5ea4b..784b97cb05b0 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -390,7 +390,7 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv)
 
         id = idr_alloc(&cm.local_id_table, cm_id_priv, next_id, 0, GFP_NOWAIT);
         if (id >= 0)
-                next_id = ((unsigned) id + 1) & MAX_IDR_MASK;
+                next_id = max(id + 1, 0);
 
         spin_unlock_irqrestore(&cm.lock, flags);
         idr_preload_end();
diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c
index 80e59ed864b3..e0d79b2395e4 100644
--- a/drivers/infiniband/hw/mlx4/cm.c
+++ b/drivers/infiniband/hw/mlx4/cm.c
@@ -225,7 +225,7 @@ id_map_alloc(struct ib_device *ibdev, int slave_id, u32 sl_cm_id)
 
         ret = idr_alloc(&sriov->pv_id_table, ent, next_id, 0, GFP_NOWAIT);
         if (ret >= 0) {
-                next_id = ((unsigned)ret + 1) & MAX_IDR_MASK;
+                next_id = max(ret + 1, 0);
                 ent->pv_cm_id = (u32)ret;
                 sl_id_map_add(ibdev, ent);
                 list_add_tail(&ent->list, &sriov->cm_list);