aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-04-08 01:22:36 -0700
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-04-08 01:23:35 -0700
commit0ce49d6da993adf8b17b7f3ed9805ade14a6a6f3 (patch)
treef9077a22752e574a61591db2fcac0d45fa2c1eb6
parent0f8e5c298fc801e8eca69e1409604c05d36e0cc4 (diff)
downloadmrst-s0i3-test-0ce49d6da993adf8b17b7f3ed9805ade14a6a6f3.tar.gz
mrst-s0i3-test-0ce49d6da993adf8b17b7f3ed9805ade14a6a6f3.tar.xz
mrst-s0i3-test-0ce49d6da993adf8b17b7f3ed9805ade14a6a6f3.zip
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 351b56ced92..d030db93d55 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -1663,7 +1663,7 @@ qla1280_load_firmware_pio(struct scsi_qla_host *ha)
/* Load RISC code. */
risc_address = ha->fwstart;
- fw_data = (const __le16 *)&fw->data[4];
+ fw_data = (const __le16 *)&fw->data[6];
risc_code_size = (fw->size - 6) / 2;
for (i = 0; i < risc_code_size; i++) {
@@ -1722,7 +1722,7 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)
/* Load RISC code. */
risc_address = ha->fwstart;
- fw_data = (const __le16 *)&fw->data[4];
+ fw_data = (const __le16 *)&fw->data[6];
risc_code_size = (fw->size - 6) / 2;
dprintk(1, "%s: DMA RISC code (%i) words\n",