diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-27 00:35:35 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-27 00:35:35 +0200 |
| commit | ebcf596d89f9686308db768e527a22165831b473 (patch) | |
| tree | df0452fdaf81db6920216d1e0136b7c08525e457 /drivers/infiniband/hw | |
| parent | Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | Merge branches 'mad-response' and 'mlx4' into fixes (diff) | |
| download | linux-ebcf596d89f9686308db768e527a22165831b473.tar.xz linux-ebcf596d89f9686308db768e527a22165831b473.zip | |
Merge tag 'ib-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
Pull infiniband fixes from Roland Dreier:
"A few fixes for regressions introduced in 3.4-rc1:
- fix memory leak in mlx4
- fix two problems with new MAD response generation code"
* tag 'ib-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/mlx4: Fix memory leaks in ib_link_query_port()
IB/mad: Don't send response for failed MADs
IB/mad: Set 'D' bit in response for unhandled MADs
Diffstat (limited to 'drivers/infiniband/hw')
| -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 669673e81439..b948b6dd5d55 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) |