diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-08-11 07:40:16 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-08-11 07:40:16 (GMT) |
commit | 41450b1b5ba101bf470b4fdf0407b30696e86bd3 (patch) | |
tree | 6d42fc8d3afc7770d8cc0c64ad92fd0835a82c1f /drivers/scsi/qla2xxx/qla_attr.c | |
parent | fe14f39e88c8ac16d0a051f8444a2294f8cb358c (diff) | |
parent | 6ac7ada210a8d23a56fbf18b6e1e00528844565c (diff) | |
download | linux-41450b1b5ba101bf470b4fdf0407b30696e86bd3.tar.xz |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_attr.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_attr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index 82b92c4..437254e 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -738,7 +738,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj, ql_log(ql_log_info, vha, 0x706f, "Issuing MPI reset.\n"); - if (IS_QLA83XX(ha)) { + if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) { uint32_t idc_control; qla83xx_idc_lock(vha, 0); |