From 4505b47145624863d5c902ed6fc773e59a6de0f2 Mon Sep 17 00:00:00 2001
From: "Kashyap, Desai" <kashyap.desai@lsi.com>
Date: Thu, 18 Mar 2010 19:18:30 +0530
Subject: [PATCH] --- yaml --- r: 195590 b: refs/heads/master c:
 48959f1eae3068fefb3de05cdc0c2bd8f0f96c37 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/message/fusion/mptsas.c   | 6 ++++++
 trunk/drivers/message/fusion/mptscsih.c | 5 -----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fe9e1155e0e3..99132557130f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3b97316d5861b1708cd7ef2df9989d12d97acb9
+refs/heads/master: 48959f1eae3068fefb3de05cdc0c2bd8f0f96c37
diff --git a/trunk/drivers/message/fusion/mptsas.c b/trunk/drivers/message/fusion/mptsas.c
index e5e9bf3487db..674461fb6a3e 100644
--- a/trunk/drivers/message/fusion/mptsas.c
+++ b/trunk/drivers/message/fusion/mptsas.c
@@ -5073,6 +5073,12 @@ static void __devexit mptsas_remove(struct pci_dev *pdev)
 	struct mptsas_portinfo *p, *n;
 	int i;
 
+	if (!ioc->sh) {
+		printk(MYIOC_s_INFO_FMT "IOC is in Target mode\n", ioc->name);
+		mpt_detach(pdev);
+		return;
+	}
+
 	mptsas_shutdown(pdev);
 
 	mptsas_del_device_components(ioc);
diff --git a/trunk/drivers/message/fusion/mptscsih.c b/trunk/drivers/message/fusion/mptscsih.c
index 929d584855d2..b966678e4419 100644
--- a/trunk/drivers/message/fusion/mptscsih.c
+++ b/trunk/drivers/message/fusion/mptscsih.c
@@ -1149,11 +1149,6 @@ mptscsih_remove(struct pci_dev *pdev)
 	MPT_SCSI_HOST		*hd;
 	int sz1;
 
-	if(!host) {
-		mpt_detach(pdev);
-		return;
-	}
-
 	scsi_remove_host(host);
 
 	if((hd = shost_priv(host)) == NULL)