1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index fd75b9139693..341c64daa959 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -117,7 +117,8 @@ qla2x00_check_reg32_for_disconnect(scsi_qla_host_t *vha, uint32_t reg)
 {
         /* Check for PCI disconnection */
         if (reg == 0xffffffff) {
-                if (!test_and_set_bit(PFLG_DISCONNECTED, &vha->pci_flags)) {
+                if (!test_and_set_bit(PFLG_DISCONNECTED, &vha->pci_flags) &&
+                    !test_bit(PFLG_DRIVER_REMOVING, &vha->pci_flags)) {
                         /*
                          * Schedule this (only once) on the default system
                          * workqueue so that all the adapter workqueues and the