From 4fa6c2713770b6cbe48d6cb0f5f905fee9919d8f Mon Sep 17 00:00:00 2001
From: Steve Wise <swise@opengridcomputing.com>
Date: Wed, 9 Sep 2009 11:25:56 -0700
Subject: [PATCH] --- yaml --- r: 157365 b: refs/heads/master c:
 ffc40c6433e763209d2b1ec5b1a9854eb3bcd61c h: refs/heads/master i:   157363:
 1e0d75050eef1ca12c826610b10c3146935a5ffb v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/infiniband/hw/cxgb3/cxio_hal.c | 1 +
 trunk/drivers/infiniband/hw/cxgb3/iwch.c     | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0707b1b890dd..9cd5a7cb25cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13a239330abdda5afcb1161fce68ec214af2cc90
+refs/heads/master: ffc40c6433e763209d2b1ec5b1a9854eb3bcd61c
diff --git a/trunk/drivers/infiniband/hw/cxgb3/cxio_hal.c b/trunk/drivers/infiniband/hw/cxgb3/cxio_hal.c
index 4dec515c676c..72ed3396b721 100644
--- a/trunk/drivers/infiniband/hw/cxgb3/cxio_hal.c
+++ b/trunk/drivers/infiniband/hw/cxgb3/cxio_hal.c
@@ -1034,6 +1034,7 @@ int cxio_rdev_open(struct cxio_rdev *rdev_p)
 err2:
 	cxio_hal_destroy_ctrl_qp(rdev_p);
 err1:
+	rdev_p->t3cdev_p->ulp = NULL;
 	list_del(&rdev_p->entry);
 	return err;
 }
diff --git a/trunk/drivers/infiniband/hw/cxgb3/iwch.c b/trunk/drivers/infiniband/hw/cxgb3/iwch.c
index 5796170b0b25..3f0c99daae8c 100644
--- a/trunk/drivers/infiniband/hw/cxgb3/iwch.c
+++ b/trunk/drivers/infiniband/hw/cxgb3/iwch.c
@@ -165,10 +165,13 @@ static void close_rnic_dev(struct t3cdev *tdev)
 static void iwch_event_handler(struct t3cdev *tdev, u32 evt, u32 port_id)
 {
 	struct cxio_rdev *rdev = tdev->ulp;
-	struct iwch_dev *rnicp = rdev_to_iwch_dev(rdev);
+	struct iwch_dev *rnicp;
 	struct ib_event event;
 	u32    portnum = port_id + 1;
 
+	if (!rdev)
+		return;
+	rnicp = rdev_to_iwch_dev(rdev);
 	switch (evt) {
 	case OFFLOAD_STATUS_DOWN: {
 		rdev->flags = CXIO_ERROR_FATAL;