diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-04-08 04:22:36 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-04-08 04:23:35 -0400 |
| commit | 0ce49d6da993adf8b17b7f3ed9805ade14a6a6f3 (patch) | |
| tree | f9077a22752e574a61591db2fcac0d45fa2c1eb6 | |
| parent | 0f8e5c298fc801e8eca69e1409604c05d36e0cc4 (diff) | |
qla1280: Fix off-by-some error in firmware loading.
We were calculating the wrong address for the start of the data.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Tested-by: Jeremy Higdon <jeremy@sgi.com>
| -rw-r--r-- | drivers/scsi/qla1280.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 351b56ced925..d030db93d55b 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c | |||
| @@ -1663,7 +1663,7 @@ qla1280_load_firmware_pio(struct scsi_qla_host *ha) | |||
| 1663 | 1663 | ||
| 1664 | /* Load RISC code. */ | 1664 | /* Load RISC code. */ |
| 1665 | risc_address = ha->fwstart; | 1665 | risc_address = ha->fwstart; |
| 1666 | fw_data = (const __le16 *)&fw->data[4]; | 1666 | fw_data = (const __le16 *)&fw->data[6]; |
| 1667 | risc_code_size = (fw->size - 6) / 2; | 1667 | risc_code_size = (fw->size - 6) / 2; |
| 1668 | 1668 | ||
| 1669 | for (i = 0; i < risc_code_size; i++) { | 1669 | for (i = 0; i < risc_code_size; i++) { |
| @@ -1722,7 +1722,7 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha) | |||
| 1722 | 1722 | ||
| 1723 | /* Load RISC code. */ | 1723 | /* Load RISC code. */ |
| 1724 | risc_address = ha->fwstart; | 1724 | risc_address = ha->fwstart; |
| 1725 | fw_data = (const __le16 *)&fw->data[4]; | 1725 | fw_data = (const __le16 *)&fw->data[6]; |
| 1726 | risc_code_size = (fw->size - 6) / 2; | 1726 | risc_code_size = (fw->size - 6) / 2; |
| 1727 | 1727 | ||
| 1728 | dprintk(1, "%s: DMA RISC code (%i) words\n", | 1728 | dprintk(1, "%s: DMA RISC code (%i) words\n", |