summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-04-24 23:11:46 (GMT)
committerRoland Dreier <roland@purestorage.com>2012-04-24 23:11:46 (GMT)
commitb609379f8db3019f26950dd914f4f6cc7078dee8 (patch)
treee297ede2a09f2dfc8ea63ffe4c417c0466df2907 /drivers
parenta9e7432319eb26ad90f18a7d215e50341d28ecb2 (diff)
parentbf6b47deb40f9fc8ddb4573373dc9614aab59d35 (diff)
downloadlinux-b609379f8db3019f26950dd914f4f6cc7078dee8.tar.xz
Merge branches 'mad-response' and 'mlx4' into fixes
Diffstat (limited to 'drivers')
-rw-r--r--drivers/infiniband/hw/mlx4/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 75d3056..cc88c9c 100644
--- 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)