From bc347c62ffb9c633be0acf7c3f0ff888693370b6 Mon Sep 17 00:00:00 2001 From: Tatyana Nikolova Date: Fri, 11 May 2012 14:29:32 -0500 Subject: [PATCH] --- yaml --- r: 302619 b: refs/heads/master c: 784d135f967849cb51c7e8d0c5230734f893331c h: refs/heads/master i: 302617: 9f07848502e2fc60519d0d42afe5f03ef87d11a9 302615: 627db3f7a3e2df9e48aa7de7ec10e72a020a752a v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/nes/nes_cm.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3e8b4c9d128e..ff007956dc7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3e5132814fb7c80c4b1c4a0ec6b4fa06943d6d5 +refs/heads/master: 784d135f967849cb51c7e8d0c5230734f893331c diff --git a/trunk/drivers/infiniband/hw/nes/nes_cm.c b/trunk/drivers/infiniband/hw/nes/nes_cm.c index 5c10cbfa2668..020e95c4c4b9 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_cm.c +++ b/trunk/drivers/infiniband/hw/nes/nes_cm.c @@ -2884,7 +2884,8 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp) ibevent.device = nesqp->ibqp.device; ibevent.event = nesqp->terminate_eventtype; ibevent.element.qp = &nesqp->ibqp; - nesqp->ibqp.event_handler(&ibevent, nesqp->ibqp.qp_context); + if (nesqp->ibqp.event_handler) + nesqp->ibqp.event_handler(&ibevent, nesqp->ibqp.qp_context); } }