From: Bang Nguyen <band.nguyen@oracle.com>
Date: Tue, 19 Feb 2013 09:25:29 +0000 (-0800)
Subject: rds: this resolved crash while removing rds_rdma module. orabug: 16268201
X-Git-Tag: v4.1.12-92~293^2^2~73
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=78f90620aeaa4279a9132030311e615b596038fe;p=users%2Fjedix%2Flinux-maple.git

rds: this resolved crash while removing rds_rdma module. orabug: 16268201

Signed-off-by: Bang Nguyen <band.nguyen@oracle.com>
(cherry picked from commit 0ee85d26682603e53b3e022ec70a55dfa98710f9)
---

diff --git a/net/rds/ib.c b/net/rds/ib.c
index 3c26e282750c..75488c2129cf 100644
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -220,7 +220,8 @@ void rds_ib_remove_one(struct ib_device *device)
 	if (!rds_ibdev)
 		return;
 
-	ib_unregister_event_handler(&rds_ibdev->event_handler);
+	if (rds_ib_haip_enabled)
+		ib_unregister_event_handler(&rds_ibdev->event_handler);
 
 	rds_ib_dev_shutdown(rds_ibdev);