1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index ff1dd4175a7..206bda093da 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -466,6 +466,7 @@ qla24xx_read_flash_dword(scsi_qla_host_t *ha, uint32_t addr)
                         udelay(10);
                 else
                         rval = QLA_FUNCTION_TIMEOUT;
+                cond_resched();
         }
 
         /* TODO: What happens if we time out? */
@@ -508,6 +509,7 @@ qla24xx_write_flash_dword(scsi_qla_host_t *ha, uint32_t addr, uint32_t data)
                         udelay(10);
                 else
                         rval = QLA_FUNCTION_TIMEOUT;
+                cond_resched();
         }
         return rval;
 }
@@ -1255,6 +1257,7 @@ qla2x00_poll_flash(scsi_qla_host_t *ha, uint32_t addr, uint8_t poll_data,
                 }
                 udelay(10);
                 barrier();
+                cond_resched();
         }
         return status;
 }
@@ -1403,6 +1406,7 @@ qla2x00_read_flash_data(scsi_qla_host_t *ha, uint8_t *tmp_buf, uint32_t saddr,
                 if (saddr % 100)
                         udelay(10);
                 *tmp_buf = data;
+                cond_resched();
         }
 }
 
@@ -1449,7 +1453,6 @@ uint8_t *
 qla2x00_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
     uint32_t offset, uint32_t length)
 {
-        unsigned long flags;
         uint32_t addr, midpoint;
         uint8_t *data;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
@@ -1458,7 +1461,6 @@ qla2x00_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
         qla2x00_suspend_hba(ha);
 
         /* Go with read. */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
         midpoint = ha->optrom_size / 2;
 
         qla2x00_flash_enable(ha);
@@ -1473,7 +1475,6 @@ qla2x00_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
                 *data = qla2x00_read_flash_byte(ha, addr);
         }
         qla2x00_flash_disable(ha);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         /* Resume HBA. */
         qla2x00_resume_hba(ha);
@@ -1487,7 +1488,6 @@ qla2x00_write_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
 {
 
         int rval;
-        unsigned long flags;
         uint8_t man_id, flash_id, sec_number, data;
         uint16_t wd;
         uint32_t addr, liter, sec_mask, rest_addr;
@@ -1500,7 +1500,6 @@ qla2x00_write_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
         sec_number = 0;
 
         /* Reset ISP chip. */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
         WRT_REG_WORD(&reg->ctrl_status, CSR_ISP_SOFT_RESET);
         pci_read_config_word(ha->pdev, PCI_COMMAND, &wd);
 
@@ -1689,10 +1688,10 @@ update_flash:
                                 rval = QLA_FUNCTION_FAILED;
                                 break;
                         }
+                        cond_resched();
                 }
         } while (0);
         qla2x00_flash_disable(ha);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         /* Resume HBA. */
         qla2x00_resume_hba(ha);