1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index da21f5fbbf87..0e4688c9e0a2 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -10,6 +10,10 @@
 #include <scsi/scsicam.h>
 
 #include "ql4_def.h"
+#include "ql4_version.h"
+#include "ql4_glbl.h"
+#include "ql4_dbg.h"
+#include "ql4_inline.h"
 
 /*
  * Driver version
@@ -711,7 +715,7 @@ static int qla4xxx_cmd_wait(struct scsi_qla_host *ha)
         return stat;
 }
 
-static void qla4xxx_hw_reset(struct scsi_qla_host *ha)
+void qla4xxx_hw_reset(struct scsi_qla_host *ha)
 {
         uint32_t ctrl_status;
         unsigned long flags = 0;
@@ -1081,13 +1085,13 @@ static void qla4xxx_free_adapter(struct scsi_qla_host *ha)
         if (ha->timer_active)
                 qla4xxx_stop_timer(ha);
 
-        /* free extra memory */
-        qla4xxx_mem_free(ha);
-
         /* Detach interrupts */
         if (test_and_clear_bit(AF_IRQ_ATTACHED, &ha->flags))
                 free_irq(ha->pdev->irq, ha);
 
+        /* free extra memory */
+        qla4xxx_mem_free(ha);
+
         pci_disable_device(ha->pdev);
 
 }
@@ -1332,6 +1336,11 @@ static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)
 
         ha = pci_get_drvdata(pdev);
 
+        qla4xxx_disable_intrs(ha);
+
+        while (test_bit(DPC_RESET_HA_INTR, &ha->dpc_flags))
+                ssleep(1);
+
         /* remove devs from iscsi_sessions to scsi_devices */
         qla4xxx_free_ddb_list(ha);