diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-17 04:17:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-17 04:17:37 +0200 |
| commit | 028940342a906db8da014a7603a0deddc2c323dd (patch) | |
| tree | 688dbc38a3e218f2493d311b1d70a67668837347 /drivers/scsi/qla2xxx/qla_sup.c | |
| parent | netfilter: nf_ct_h323: fix usage of MODULE_ALIAS_NFCT_HELPER (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| download | linux-028940342a906db8da014a7603a0deddc2c323dd.tar.xz linux-028940342a906db8da014a7603a0deddc2c323dd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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 3c13c0a6be63..a683e766d1ae 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)) |