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

Commit 9a6e6400 authored Sep 25, 2014 by Alex Vechersky Committed by Christoph Hellwig Sep 25, 2014

qla2xxx: Add missing ISP27xx checks to optrom code.



Signed-off-by: Alex Vechersky <alex.vechersky@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent f3982d89

drivers/scsi/qla2xxx/qla_attr.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -484,7 +484,8 @@ qla2x00_sysfs_write_optrom_ctl(struct file filp, struct kobject kobj,
		start == (ha->flt_region_fw * 4))
		valid = 1;
		else if (IS_QLA24XX_TYPE(ha) \|\| IS_QLA25XX(ha)
		\|\| IS_CNA_CAPABLE(ha) \|\| IS_QLA2031(ha))
		\|\| IS_CNA_CAPABLE(ha) \|\| IS_QLA2031(ha)
		\|\| IS_QLA27XX(ha))
		valid = 1;
		if (!valid) {
		ql_log(ql_log_warn, vha, 0x7065,

drivers/scsi/qla2xxx/qla_bsg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1390,7 +1390,7 @@ qla2x00_optrom_setup(struct fc_bsg_job bsg_job, scsi_qla_host_t vha,
		start == (ha->flt_region_fw * 4))
		valid = 1;
		else if (IS_QLA24XX_TYPE(ha) \|\| IS_QLA25XX(ha) \|\|
		IS_CNA_CAPABLE(ha) \|\| IS_QLA2031(ha))
		IS_CNA_CAPABLE(ha) \|\| IS_QLA2031(ha) \|\| IS_QLA27XX(ha))
		valid = 1;
		if (!valid) {
		ql_log(ql_log_warn, vha, 0x7058,