qla2xxx: Add fix in driver unload for pending activity.

Signed-off-by: Sawan Chandak <sawan.chandak@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 4880f0b2daa3f4142f4d9ab794d283cda1a327a1..72b94f9ca637410020e39c6a464499f136601fe6 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -860,8 +860,10 @@ qla2x00_wait_for_hba_ready(scsi_qla_host_t *vha)
 {
        struct qla_hw_data *ha = vha->hw;
 
-       while ((!(vha->flags.online) || ha->dpc_active ||
-           ha->flags.mbox_busy))
+       while (((qla2x00_reset_active(vha)) || ha->dpc_active ||
+           ha->flags.mbox_busy) ||
+               test_bit(FX00_RESET_RECOVERY, &vha->dpc_flags) ||
+               test_bit(FX00_TARGET_SCAN, &vha->dpc_flags))
                msleep(1000);
 }