projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SCSI] qla2xxx: Removed redundant check for ISP 84xx.
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
qla2xxx
/
qla_attr.c
diff --git
a/drivers/scsi/qla2xxx/qla_attr.c
b/drivers/scsi/qla2xxx/qla_attr.c
index 1e4cafabba15287738b209d6b0725f2cfe23d368..fd6f7b10054798a73175e21bbdb07ae42d75e29d 100644
(file)
--- a/
drivers/scsi/qla2xxx/qla_attr.c
+++ b/
drivers/scsi/qla2xxx/qla_attr.c
@@
-1208,7
+1208,7
@@
qla24xx_84xx_fw_version_show(struct device *dev,
if (!IS_QLA84XX(ha))
return snprintf(buf, PAGE_SIZE, "\n");
if (!IS_QLA84XX(ha))
return snprintf(buf, PAGE_SIZE, "\n");
- if (ha->cs84xx
&& ha->cs84xx
->op_fw_version == 0)
+ if (ha->cs84xx->op_fw_version == 0)
rval = qla84xx_verify_chip(vha, status);
if ((rval == QLA_SUCCESS) && (status[0] == 0))
rval = qla84xx_verify_chip(vha, status);
if ((rval == QLA_SUCCESS) && (status[0] == 0))
@@
-1732,7
+1732,7
@@
qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
fc_vport_set_state(fc_vport, FC_VPORT_LINKDOWN);
}
fc_vport_set_state(fc_vport, FC_VPORT_LINKDOWN);
}
- if (
IS_QLA25XX(ha
) && ql2xenabledif) {
+ if (
(IS_QLA25XX(ha) || IS_QLA81XX(ha)
) && ql2xenabledif) {
if (ha->fw_attributes & BIT_4) {
vha->flags.difdix_supported = 1;
DEBUG18(qla_printk(KERN_INFO, ha,
if (ha->fw_attributes & BIT_4) {
vha->flags.difdix_supported = 1;
DEBUG18(qla_printk(KERN_INFO, ha,