From 93adf91e5a4c67a4924b2e8a88ea95cbc3209ed1 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Tue, 3 Aug 2010 21:35:36 +0000 Subject: [PATCH] --- yaml --- r: 206717 b: refs/heads/master c: 2db00321815e20f4a7ff9df43f7cf2073085683d h: refs/heads/master i: 206715: b5c2bb1eb15670f7e157fde014ce804c40c75d59 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ehca/ehca_mrmw.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 35fb354cc652..0ec93b3bef23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd5d0ccbef9f2565e76dba4ff291da6a2cb8b1b4 +refs/heads/master: 2db00321815e20f4a7ff9df43f7cf2073085683d diff --git a/trunk/drivers/infiniband/hw/ehca/ehca_mrmw.c b/trunk/drivers/infiniband/hw/ehca/ehca_mrmw.c index 31a68b9c52d0..53f4cd4fc19a 100644 --- a/trunk/drivers/infiniband/hw/ehca/ehca_mrmw.c +++ b/trunk/drivers/infiniband/hw/ehca/ehca_mrmw.c @@ -933,11 +933,6 @@ int ehca_unmap_fmr(struct list_head *fmr_list) /* check all FMR belong to same SHCA, and check internal flag */ list_for_each_entry(ib_fmr, fmr_list, list) { prev_shca = shca; - if (!ib_fmr) { - ehca_gen_err("bad fmr=%p in list", ib_fmr); - ret = -EINVAL; - goto unmap_fmr_exit0; - } shca = container_of(ib_fmr->device, struct ehca_shca, ib_device); e_fmr = container_of(ib_fmr, struct ehca_mr, ib.ib_fmr);