diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-08 06:31:24 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-08 06:31:24 -0500 |
| commit | 636f0c70f2557e0819b50c74e31b4a027327015e (patch) | |
| tree | 3a259ef26659dac92782651440091b9f5ab1a7f7 /drivers/scsi/qla2xxx/qla_init.c | |
| parent | 675eef66e3edcab8065533edfefbcbbacb9a30d3 (diff) | |
| parent | 2e885057b7f75035f0b85e02f737891482815a81 (diff) | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_init.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index f03e915f1877..54ea68cec4c5 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
| @@ -1509,7 +1509,8 @@ enable_82xx_npiv: | |||
| 1509 | &ha->fw_xcb_count, NULL, NULL, | 1509 | &ha->fw_xcb_count, NULL, NULL, |
| 1510 | &ha->max_npiv_vports, NULL); | 1510 | &ha->max_npiv_vports, NULL); |
| 1511 | 1511 | ||
| 1512 | if (!fw_major_version && ql2xallocfwdump) | 1512 | if (!fw_major_version && ql2xallocfwdump |
| 1513 | && !IS_QLA82XX(ha)) | ||
| 1513 | qla2x00_alloc_fw_dump(vha); | 1514 | qla2x00_alloc_fw_dump(vha); |
| 1514 | } | 1515 | } |
| 1515 | } else { | 1516 | } else { |