Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a49393f2 authored Apr 25, 2012 by Giridhar Malavali Committed by James Bottomley May 10, 2012

[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>

parent f4e1648a

drivers/scsi/qla2xxx/qla_bsg.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1367,6 +1367,9 @@ qla2x00_read_optrom(struct fc_bsg_job *bsg_job)
		struct qla_hw_data *ha = vha->hw;
		int rval = 0;

		if (ha->flags.isp82xx_reset_hdlr_active)
		return -EBUSY;

		rval = qla2x00_optrom_setup(bsg_job, vha, 0);
		if (rval)
		return rval;

drivers/scsi/qla2xxx/qla_sup.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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))