Skip to content

Commit e27513e

Browse files
Alex Porosanuherbertx
authored andcommitted
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 <[email protected]> Signed-off-by: Horia Geant? <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent b1ccc8f commit e27513e

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/crypto/caam/ctrl.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -370,14 +370,14 @@ static void kick_trng(struct platform_device *pdev, int ent_delay)
370370
int caam_get_era(void)
371371
{
372372
struct device_node *caam_node;
373-
for_each_compatible_node(caam_node, NULL, "fsl,sec-v4.0") {
374-
const uint32_t *prop = (uint32_t *)of_get_property(caam_node,
375-
"fsl,sec-era",
376-
NULL);
377-
return prop ? *prop : -ENOTSUPP;
378-
}
373+
int ret;
374+
u32 prop;
375+
376+
caam_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
377+
ret = of_property_read_u32(caam_node, "fsl,sec-era", &prop);
378+
of_node_put(caam_node);
379379

380-
return -ENOTSUPP;
380+
return IS_ERR_VALUE(ret) ? -ENOTSUPP : prop;
381381
}
382382
EXPORT_SYMBOL(caam_get_era);
383383

0 commit comments

Comments
 (0)