Merge remote-tracking branch 'drm-intel/for-linux-next'

[karo-tx-linux.git] / drivers / crypto / caam / caamhash.c

diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index e732bd962e98cc715db6463c7587dbb2511707e3..ca6218eee460f6b71e99bda6475fdde3e8af9e19 100644 (file)
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -1833,6 +1833,13 @@ static int __init caam_algapi_hash_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;
+
        INIT_LIST_HEAD(&priv->hash_list);
 
        atomic_set(&priv->tfm_count, -1);