2 files changed, 6 insertions, 5 deletions

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index e5e9bf3487d..674461fb6a3 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/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/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 929d584855d..b966678e441 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/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)