diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 15:01:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 15:01:22 -0400 |
| commit | 1e17d774db837fe1a536066cbe971114405d2ba1 (patch) | |
| tree | 41f2a21f6676eaace57ed4f4872f57d551e00c42 /drivers/scsi | |
| parent | d848223808c5d21e1b3cea090047e34722c6254b (diff) | |
| parent | 0ce49d6da993adf8b17b7f3ed9805ade14a6a6f3 (diff) | |
Merge git://git.infradead.org/~dwmw2/firmware-2.6
* git://git.infradead.org/~dwmw2/firmware-2.6:
qla1280: Fix off-by-some error in firmware loading.
Add README.AddingFirmware file. Basically telling people not to.
firmware: Remove newly-added slicoss and sxg firmware images
firmware/WHENCE: Add missing origin information for Ambassador atmsar11.fw
ALSA: wavefront - Always use request_firmware()
Remove fdump tool for av7110 firmware
firmware: convert av7110 driver to request_firmware()
Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card"
Revert "fix modules_install via NFS"
Add-add conflicts in firmware/WHENCE fixed manually
Diffstat (limited to 'drivers/scsi')
| -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 687dcf2d0154..5defe5ea5eda 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", |