1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c
index d1939a9539c0..588ad2288f82 100644
--- a/drivers/crypto/caam/caamrng.c
+++ b/drivers/crypto/caam/caamrng.c
@@ -298,6 +298,13 @@ static int __init caam_rng_init(void)
         priv = dev_get_drvdata(ctrldev);
         of_node_put(dev_node);
 
+        /*
+         * If priv is NULL, it's probably because the caam driver wasn't
+         * properly initialized (e.g. RNG4 init failed). Thus, bail out here.
+         */
+        if (!priv)
+                return -ENODEV;
+
         caam_init_rng(&rng_ctx, priv->jrdev[0]);
 
         dev_info(priv->jrdev[0], "registering rng-caam\n");