Commit 51d13aaf authored Oct 22, 2019 by Andrey Smirnov Committed by Herbert Xu Nov 01, 2019

crypto: caam - populate platform devices last



Move the call to devm_of_platform_populate() at the end of
caam_probe(), so we won't try to add any child devices until all of
the initialization is finished successfully.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Horia Geantă <horia.geanta@nxp.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Iuliana Prodan <iuliana.prodan@nxp.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 1a1c4f00

drivers/crypto/caam/ctrl.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -747,12 +747,6 @@ static int caam_probe(struct platform_device *pdev)
		#endif
		}

		ret = devm_of_platform_populate(dev);
		if (ret) {
		dev_err(dev, "JR platform devices creation error\n");
		return ret;
		}

		ring = 0;
		for_each_available_child_of_node(nprop, np)
		if (of_device_is_compatible(np, "fsl,sec-v4.0-job-ring") \|\|
		@@ -905,7 +899,12 @@ static int caam_probe(struct platform_device *pdev)
		debugfs_create_blob("tdsk", S_IRUSR \| S_IRGRP \| S_IROTH, ctrlpriv->ctl,
		&ctrlpriv->ctl_tdsk_wrap);
		#endif
		return 0;

		ret = devm_of_platform_populate(dev);
		if (ret)
		dev_err(dev, "JR platform devices creation error\n");

		return ret;
		}

		static struct platform_driver caam_driver = {

Admin message