summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorAnson Huang2019-05-24 07:51:00 +0200
committerShawn Guo2019-06-05 08:08:10 +0200
commitd8dfab0f4d0669ae299511e3ab3e79f312476f75 (patch)
treef33c9f29e168cb2318a1f5d769105211d7bc2cd8 /drivers/soc
parentsoc: imx: Add SCU SoC info driver support (diff)
downloadkernel-qcow2-linux-d8dfab0f4d0669ae299511e3ab3e79f312476f75.tar.gz
kernel-qcow2-linux-d8dfab0f4d0669ae299511e3ab3e79f312476f75.tar.xz
kernel-qcow2-linux-d8dfab0f4d0669ae299511e3ab3e79f312476f75.zip
soc: imx: soc-imx8: Avoid unnecessary of_node_put() in error handling
of_node_put() is called after of_match_node() successfully called, then in the following error handling, of_node_put() is called again which is unnecessary, this patch adjusts the location of of_node_put() to avoid such scenario. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/imx/soc-imx8.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/imx/soc-imx8.c b/drivers/soc/imx/soc-imx8.c
index cd10726e64e4..d377a90f3a2f 100644
--- a/drivers/soc/imx/soc-imx8.c
+++ b/drivers/soc/imx/soc-imx8.c
@@ -115,8 +115,6 @@ static int __init imx8_soc_init(void)
if (!id)
goto free_soc;
- of_node_put(root);
-
data = id->data;
if (data) {
soc_dev_attr->soc_id = data->name;
@@ -132,6 +130,8 @@ static int __init imx8_soc_init(void)
if (IS_ERR(soc_dev))
goto free_rev;
+ of_node_put(root);
+
return 0;
free_rev: