summaryrefslogtreecommitdiffstats
path: root/drivers/char/hw_random
diff options
context:
space:
mode:
authorStefan Wahren2018-02-12 21:11:36 +0100
committerHerbert Xu2018-02-22 15:16:21 +0100
commit7b4c5d30d0bd2b22c09d4d993a76e0973a873891 (patch)
treef61a393bcba127dbfbdfa25c3298187647091361 /drivers/char/hw_random
parentcrypto: arm/aes-cipher - move S-box to .rodata section (diff)
downloadkernel-qcow2-linux-7b4c5d30d0bd2b22c09d4d993a76e0973a873891.tar.gz
kernel-qcow2-linux-7b4c5d30d0bd2b22c09d4d993a76e0973a873891.tar.xz
kernel-qcow2-linux-7b4c5d30d0bd2b22c09d4d993a76e0973a873891.zip
hwrng: bcm2835 - Handle deferred clock properly
In case the probe of the clock is deferred, we would assume it is optional. This is wrong, so defer the probe of this driver until the clock is available. Fixes: 791af4f4907a ("hwrng: bcm2835 - Manage an optional clock") Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/char/hw_random')
-rw-r--r--drivers/char/hw_random/bcm2835-rng.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c
index 7a84cec30c3a..6767d965c36c 100644
--- a/drivers/char/hw_random/bcm2835-rng.c
+++ b/drivers/char/hw_random/bcm2835-rng.c
@@ -163,6 +163,8 @@ static int bcm2835_rng_probe(struct platform_device *pdev)
/* Clock is optional on most platforms */
priv->clk = devm_clk_get(dev, NULL);
+ if (IS_ERR(priv->clk) && PTR_ERR(priv->clk) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
priv->rng.name = pdev->name;
priv->rng.init = bcm2835_rng_init;