Merge 4.3-rc3 into char-misc-next

We want those fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/char/hw_random/xgene-rng.c b/drivers/char/hw_random/xgene-rng.c
index c37cf754a985..3c77645405e5 100644
--- a/drivers/char/hw_random/xgene-rng.c
+++ b/drivers/char/hw_random/xgene-rng.c
@@ -344,11 +344,12 @@ static int xgene_rng_probe(struct platform_device *pdev)
         if (IS_ERR(ctx->csr_base))
                 return PTR_ERR(ctx->csr_base);
 
-        ctx->irq = platform_get_irq(pdev, 0);
-        if (ctx->irq < 0) {
+        rc = platform_get_irq(pdev, 0);
+        if (rc < 0) {
                 dev_err(&pdev->dev, "No IRQ resource\n");
-                return ctx->irq;
+                return rc;
         }
+        ctx->irq = rc;
 
         dev_dbg(&pdev->dev, "APM X-Gene RNG BASE %p ALARM IRQ %d",
                 ctx->csr_base, ctx->irq);