]> err.no Git - linux-2.6/commitdiff
[SCSI] qla2xxx: Correct sector-erase issues while writing flash.
authorAndrew Vasquez <andrew.vasquez@qlogic.com>
Mon, 29 Jan 2007 18:22:18 +0000 (10:22 -0800)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Wed, 31 Jan 2007 17:04:44 +0000 (11:04 -0600)
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/qla2xxx/qla_sup.c

index 15390ad87456399a774ac65e25a5f519216adf15..7bbe751a7334e8fade0ade9ba2ded0e638be734c 100644 (file)
@@ -611,7 +611,6 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,
                                            flash_conf_to_access_addr(0x0339),
                                            (fdata & 0xff00) | ((fdata << 16) &
                                            0xff0000) | ((fdata >> 16) & 0xff));
-                               fdata = (faddr & sec_mask) << 2;
                                ret = qla24xx_write_flash_dword(ha, conf_addr,
                                    (fdata & 0xff00) |((fdata << 16) &
                                    0xff0000) | ((fdata >> 16) & 0xff));