scsi: qla2xxx: Change the return type of qla24xx_read_flash_data()

[linux-2.6-microblaze.git] / drivers / scsi / qla2xxx / qla_sup.c

diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 1eb8238..764e1bb 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -473,22 +473,24 @@ qla24xx_read_flash_dword(struct qla_hw_data *ha, uint32_t addr, uint32_t *data)
        return QLA_FUNCTION_TIMEOUT;
 }
 
-uint32_t *
+int
 qla24xx_read_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,
     uint32_t dwords)
 {
        ulong i;
+       int ret = QLA_SUCCESS;
        struct qla_hw_data *ha = vha->hw;
 
        /* Dword reads to flash. */
        faddr =  flash_data_addr(ha, faddr);
        for (i = 0; i < dwords; i++, faddr++, dwptr++) {
-               if (qla24xx_read_flash_dword(ha, faddr, dwptr))
+               ret = qla24xx_read_flash_dword(ha, faddr, dwptr);
+               if (ret != QLA_SUCCESS)
                        break;
                cpu_to_le32s(dwptr);
        }
 
-       return dwptr;
+       return ret;
 }
 
 static int