summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Porosanu <alexandru.porosanu@freescale.com>2015-07-17 16:54:51 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2015-07-20 15:53:39 +0800
commite27513eb61bae759b7d5f340cf39d60f0d15a00b (patch)
tree62faebe355b7728b37b408f8ed8a1259f32623c7
parentb1ccc8f4b63109f9e56fadf72274714dfb000123 (diff)
downloadblackbird-op-linux-e27513eb61bae759b7d5f340cf39d60f0d15a00b.tar.gz
blackbird-op-linux-e27513eb61bae759b7d5f340cf39d60f0d15a00b.zip
crypto: caam - fix ERA property reading
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>
-rw-r--r--drivers/crypto/caam/ctrl.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index efacab7539ef..598823746a3b 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -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);
OpenPOWER on IntegriCloud