diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-27 12:44:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-27 12:44:02 -0700 |
| commit | c566f365434e732986d7904e29c8122dfcb1e333 (patch) | |
| tree | a2189979d71d844f62d0ef75836e9f6c72ab60ff /drivers/char | |
| parent | b05b7c7cc0324524dcda7fa7c2be1255290ee416 (diff) | |
| parent | 9ffecb10283508260936b96022d4ee43a7798b4c (diff) | |
| download | linux-c566f365434e732986d7904e29c8122dfcb1e333.tar.bz2 | |
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>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hw_random/xgene-rng.c | 7 |
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); |