crypto: caam - fix ERA property reading
authorAlex Porosanu <alexandru.porosanu@freescale.com>
Fri, 17 Jul 2015 13:54:51 +0000 (16:54 +0300)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 20 Jul 2015 07:53:39 +0000 (15:53 +0800)
In order to ensure that the ERA property is properly read from DT
on all platforms, of_property_read* function needs to be used.

Signed-off-by: Alex Porosanu <alexandru.porosanu@freescale.com>
Signed-off-by: Horia Geant? <horia.geanta@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/caam/ctrl.c

index efacab7..5988237 100644 (file)
@@ -370,14 +370,14 @@ static void kick_trng(struct platform_device *pdev, int ent_delay)
 int caam_get_era(void)
 {
        struct device_node *caam_node;
-       for_each_compatible_node(caam_node, NULL, "fsl,sec-v4.0") {
-               const uint32_t *prop = (uint32_t *)of_get_property(caam_node,
-                               "fsl,sec-era",
-                               NULL);
-               return prop ? *prop : -ENOTSUPP;
-       }
+       int ret;
+       u32 prop;
+
+       caam_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
+       ret = of_property_read_u32(caam_node, "fsl,sec-era", &prop);
+       of_node_put(caam_node);
 
-       return -ENOTSUPP;
+       return IS_ERR_VALUE(ret) ? -ENOTSUPP : prop;
 }
 EXPORT_SYMBOL(caam_get_era);