diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 15:16:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 15:16:07 -0500 |
| commit | 12dbf3fc4d06d2c0c4c44dc0612df04248b3cfd3 (patch) | |
| tree | 158610ef6c7711afb60d78956ab4b131bf6a08ef /drivers/scsi/qla2xxx/qla_sup.c | |
| parent | 61b7efddc5256225099d13185659e9ad9d8abc8a (diff) | |
| parent | fc091e03820bf67e543362bd40959701a71d0c27 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_sup.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_sup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c index d54d2a99c3d3..f4d755a643e4 100644 --- a/drivers/scsi/qla2xxx/qla_sup.c +++ b/drivers/scsi/qla2xxx/qla_sup.c | |||
| @@ -573,6 +573,9 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr, | |||
| 573 | } | 573 | } |
| 574 | } while (0); | 574 | } while (0); |
| 575 | 575 | ||
| 576 | /* Enable flash write-protection. */ | ||
| 577 | qla24xx_write_flash_dword(ha, flash_conf_to_access_addr(0x101), 0x9c); | ||
| 578 | |||
| 576 | /* Disable flash write. */ | 579 | /* Disable flash write. */ |
| 577 | WRT_REG_DWORD(®->ctrl_status, | 580 | WRT_REG_DWORD(®->ctrl_status, |
| 578 | RD_REG_DWORD(®->ctrl_status) & ~CSRX_FLASH_ENABLE); | 581 | RD_REG_DWORD(®->ctrl_status) & ~CSRX_FLASH_ENABLE); |