Merge branches 'mad-response' and 'mlx4' into fixes

b609379f · Roland Dreier · a9e74323 · bf6b47de · b609379f
Commit b609379f authored Apr 24, 2012 by Roland Dreier
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/infiniband/hw/mlx4/main.c drivers/infiniband/hw/mlx4/main.c +1 -1

No files found.
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -247,7 +247,7 @@ static int ib_link_query_port(struct ib_device *ibdev, u8 port,
 		err = mlx4_MAD_IFC(to_mdev(ibdev), 1, 1, port,
 				   NULL, NULL, in_mad, out_mad);
 		if (err)
-			return err;
+			goto out;

 		/* Checking LinkSpeedActive for FDR-10 */
 		if (out_mad->data[15] & 0x1)