Merge commit 'v2.6.30-rc5' into core/iommu

Merge reason: core/iommu was on an .30-rc1 base,
              update it to .30-rc5 to refresh.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/mlx4/port.c b/drivers/net/mlx4/port.c
index 7cce3342ef8c..606aa58afdea 100644
--- a/drivers/net/mlx4/port.c
+++ b/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,