hwrng: imx-rngc - fix an error path

commit 60eafd5681dd4005f8a79c88f83289be0179e899 upstream.

Make sure that the rngc interrupt is masked if the rngc self test fails.
Self test failure means that probe fails as well. Interrupts should be
masked in this case, regardless of the error.

Cc: stable@vger.kernel.org
Fixes: 21958a749752 ("hwrng: mx-rngc - add a driver for Freescale RNGC")
Reviewed-by: PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/hw_random/imx-rngc.c b/drivers/char/hw_random/imx-rngc.c
index 30cf00f8e9a09ad3c57b0c4190080cd38311f669..0576801944fdd0e43130416965a56d3634271734 100644 (file)
--- a/drivers/char/hw_random/imx-rngc.c
+++ b/drivers/char/hw_random/imx-rngc.c
@@ -105,8 +105,10 @@ static int imx_rngc_self_test(struct imx_rngc *rngc)
                return -ETIMEDOUT;
        }
 
-       if (rngc->err_reg != 0)
+       if (rngc->err_reg != 0) {
+               imx_rngc_irq_mask_clear(rngc);
                return -EIO;
+       }
 
        return 0;
 }