From 4e614179832ee15663e3486770263f9b3309ac7d Mon Sep 17 00:00:00 2001 From: Alex Porosanu Date: Tue, 19 May 2015 18:17:33 +0300 Subject: crypto: caam - fix SEC ERA reading MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to ensure that the SEC ERA property is properly read from DTS, of_property_read* functions need to be used. Signed-off-by: Alex Porosanu Signed-off-by: Horia Geantă Change-Id: I3fe958ca9b0ab91c2dbd089d1b2f090042cc3fd0 Reviewed-on: http://git.am.freescale.net:8181/39374 Tested-by: Review Code-CDREVIEW Reviewed-by: Zhengxiong Jin diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 1d77f5a..0359c71 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -388,14 +388,14 @@ static void kick_trng(struct device *dev, 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); -- cgit v0.10.2