From 46c348aea57785ee08d9a1150e75e19ec932765d Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Fri, 31 Dec 2010 02:22:20 -0600
Subject: [PATCH] --- yaml --- r: 226887 b: refs/heads/master c:
 1227633a441363642cdbaf38c4241d071e917095 h: refs/heads/master i:   226885:
 500b29ca5062209a236cd693b6968b8b5931e87e   226883:
 27f0464d98a7b321994b53d8096aa7ee2f897ad8   226879:
 d9ed187350c4bc4a0cc4c12173e30baaa01970d7 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/scsi/be2iscsi/be_main.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c5d458be7908..4fd05791f049 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc7accec8788ada4f459461194c2b8fad94ed239
+refs/heads/master: 1227633a441363642cdbaf38c4241d071e917095
diff --git a/trunk/drivers/scsi/be2iscsi/be_main.c b/trunk/drivers/scsi/be2iscsi/be_main.c
index be07ca06177e..79cefbe31367 100644
--- a/trunk/drivers/scsi/be2iscsi/be_main.c
+++ b/trunk/drivers/scsi/be2iscsi/be_main.c
@@ -3914,7 +3914,8 @@ static void beiscsi_cleanup_task(struct iscsi_task *task)
 			io_task->psgl_handle = NULL;
 		}
 	} else {
-		if ((task->hdr->opcode & ISCSI_OPCODE_MASK) == ISCSI_OP_LOGIN)
+		if (task->hdr &&
+		   ((task->hdr->opcode & ISCSI_OPCODE_MASK) == ISCSI_OP_LOGIN))
 			return;
 		if (io_task->psgl_handle) {
 			spin_lock(&phba->mgmt_sgl_lock);