Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / drivers / scsi / qla2xxx / qla_isr.c

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index d2a4c75e5b8fbc7f086877767e84c88bf49ea704..2d8e7b81235253734bd6bbf0041900ff92ba1afd 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2485,6 +2485,7 @@ qla2xxx_check_risc_status(scsi_qla_host_t *vha)
        if (rval == QLA_SUCCESS)
                goto next_test;
 
+       rval = QLA_SUCCESS;
        WRT_REG_DWORD(&reg->iobase_window, 0x0003);
        for (cnt = 100; (RD_REG_DWORD(&reg->iobase_window) & BIT_0) == 0 &&
            rval == QLA_SUCCESS; cnt--) {