Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 130286
b: refs/heads/master
c: 7c28317
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Vasquez authored and James Bottomley committed Jan 25, 2009
1 parent c752719 commit abb652e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ad038fa8242a1f4547045f9213c3881a34bbcc21
refs/heads/master: 7c283177fad8786afa1bbf7ef848038284084e41
7 changes: 2 additions & 5 deletions trunk/drivers/scsi/qla2xxx/qla_sup.c
Original file line number Diff line number Diff line change
Expand Up @@ -980,12 +980,11 @@ qla24xx_write_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,
uint32_t dwords)
{
int ret;
uint32_t liter, miter;
uint32_t liter;
uint32_t sec_mask, rest_addr;
uint32_t fdata;
dma_addr_t optrom_dma;
void *optrom = NULL;
uint32_t *s, *d;
struct qla_hw_data *ha = vha->hw;

ret = QLA_SUCCESS;
Expand Down Expand Up @@ -1031,9 +1030,7 @@ qla24xx_write_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,
/* Go with burst-write. */
if (optrom && (liter + OPTROM_BURST_DWORDS) <= dwords) {
/* Copy data to DMA'ble buffer. */
for (miter = 0, s = optrom, d = dwptr;
miter < OPTROM_BURST_DWORDS; miter++, s++, d++)
*s = cpu_to_le32(*d);
memcpy(optrom, dwptr, OPTROM_BURST_SIZE);

ret = qla2x00_load_ram(vha, optrom_dma,
flash_data_addr(ha, faddr),
Expand Down

0 comments on commit abb652e

Please sign in to comment.