diff --git a/[refs] b/[refs]
index 6f8395540784..16c14bb4e20f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1d60ec6699f19b760df8261e922ae236ea7bb31
+refs/heads/master: 352b09edd7fa8145bfc9e5db0cc0fed971b69440
diff --git a/trunk/drivers/net/mlx4/port.c b/trunk/drivers/net/mlx4/port.c
index 7cce3342ef8c..606aa58afdea 100644
--- a/trunk/drivers/net/mlx4/port.c
+++ b/trunk/drivers/net/mlx4/port.c
@@ -299,13 +299,14 @@ int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port)
 	struct mlx4_cmd_mailbox *mailbox;
 	int err;
 
+	if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH)
+		return 0;
+
 	mailbox = mlx4_alloc_cmd_mailbox(dev);
 	if (IS_ERR(mailbox))
 		return PTR_ERR(mailbox);
 
 	memset(mailbox->buf, 0, 256);
-	if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH)
-		return 0;
 
 	((__be32 *) mailbox->buf)[1] = dev->caps.ib_port_def_cap[port];
 	err = mlx4_cmd(dev, mailbox->dma, port, 0, MLX4_CMD_SET_PORT,