diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-30 04:54:02 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-30 04:54:02 (GMT) |
| commit | 6abdd5f5935fff978f950561f3c5175eb34dad73 (patch) | |
| tree | 6f3ed3a4f4af9e74436ec9355ebf8201357f1c40 /drivers/infiniband/hw/hfi1/qp.c | |
| parent | 0b498a52778368ff501557d68c7b50878ab1701e (diff) | |
| parent | e4e98c460ad38c78498622a164fd5ef09a2dc9cb (diff) | |
| download | linux-6abdd5f5935fff978f950561f3c5175eb34dad73.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All three conflicts were cases of simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/qp.c')
| -rw-r--r-- | drivers/infiniband/hw/hfi1/qp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/hfi1/qp.c b/drivers/infiniband/hw/hfi1/qp.c index a5aa351..4e4d831 100644 --- a/drivers/infiniband/hw/hfi1/qp.c +++ b/drivers/infiniband/hw/hfi1/qp.c @@ -656,10 +656,6 @@ struct qp_iter *qp_iter_init(struct hfi1_ibdev *dev) iter->dev = dev; iter->specials = dev->rdi.ibdev.phys_port_cnt * 2; - if (qp_iter_next(iter)) { - kfree(iter); - return NULL; - } return iter; } |