diff --git a/[refs] b/[refs]
index b2987bb588e6..6a9217c41cdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b336369c1e1ad88495895260a9068eb18bc48b6c
+refs/heads/master: 0926f91083f34d047abc74f1ca4fa6a9c161f7db
diff --git a/trunk/drivers/net/mlx4/port.c b/trunk/drivers/net/mlx4/port.c
index 606aa58afdea..8674ad5764c4 100644
--- a/trunk/drivers/net/mlx4/port.c
+++ b/trunk/drivers/net/mlx4/port.c
@@ -111,6 +111,12 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *index)
 			goto out;
 		}
 	}
+
+	if (free < 0) {
+		err = -ENOMEM;
+		goto out;
+	}
+
 	mlx4_dbg(dev, "Free MAC index is %d\n", free);
 
 	if (table->total == table->max) {
@@ -205,6 +211,11 @@ int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index)
 		}
 	}
 
+	if (free < 0) {
+		err = -ENOMEM;
+		goto out;
+	}
+
 	if (table->total == table->max) {
 		/* No free vlan entries */
 		err = -ENOSPC;