diff options
| author | Giridhar Malavali <giridhar.malavali@qlogic.com> | 2012-04-25 07:26:14 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-05-10 08:10:58 +0100 |
| commit | a49393f2ae13e3a0c61dbdbea77c2ff7614df474 (patch) | |
| tree | efe0cbeb4d55a0dea42ffc9aa03430376d9ab3c9 /drivers/scsi/qla2xxx/qla_sup.c | |
| parent | f4e1648a4f4acc964cefc51c1637aad0dca6c517 (diff) | |
| download | op-kernel-dev-a49393f2ae13e3a0c61dbdbea77c2ff7614df474.zip op-kernel-dev-a49393f2ae13e3a0c61dbdbea77c2ff7614df474.tar.gz | |
[SCSI] qla2xxx: Block flash access from application when device is initialized for ISP82xx.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_sup.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_sup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c index 3c13c0a..a683e76 100644 --- a/drivers/scsi/qla2xxx/qla_sup.c +++ b/drivers/scsi/qla2xxx/qla_sup.c @@ -1017,6 +1017,9 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha) !IS_CNA_CAPABLE(ha) && !IS_QLA2031(ha)) return; + if (ha->flags.isp82xx_reset_hdlr_active) + return; + ha->isp_ops->read_optrom(vha, (uint8_t *)&hdr, ha->flt_region_npiv_conf << 2, sizeof(struct qla_npiv_header)); if (hdr.version == __constant_cpu_to_le16(0xffff)) |
