diff options
| author | Roland Dreier <roland@purestorage.com> | 2012-04-25 01:11:46 +0200 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2012-04-25 01:11:46 +0200 |
| commit | b609379f8db3019f26950dd914f4f6cc7078dee8 (patch) | |
| tree | e297ede2a09f2dfc8ea63ffe4c417c0466df2907 | |
| parent | IB/mad: Don't send response for failed MADs (diff) | |
| parent | IB/mlx4: Fix memory leaks in ib_link_query_port() (diff) | |
| download | linux-b609379f8db3019f26950dd914f4f6cc7078dee8.tar.xz linux-b609379f8db3019f26950dd914f4f6cc7078dee8.zip | |
Merge branches 'mad-response' and 'mlx4' into fixes
| -rw-r--r-- | drivers/infiniband/hw/mlx4/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index 75d305629300..cc88c9c955c9 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) |