diff options
author | Anson Huang <Anson.Huang@nxp.com> | 2019-05-24 01:51:00 -0400 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2019-06-05 02:08:10 -0400 |
commit | d8dfab0f4d0669ae299511e3ab3e79f312476f75 (patch) | |
tree | f33c9f29e168cb2318a1f5d769105211d7bc2cd8 | |
parent | 15f5276a2fb1ad70d7a8e6321dd751c3d081e422 (diff) |
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>
-rw-r--r-- | drivers/soc/imx/soc-imx8.c | 4 |
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) | |||
115 | if (!id) | 115 | if (!id) |
116 | goto free_soc; | 116 | goto free_soc; |
117 | 117 | ||
118 | of_node_put(root); | ||
119 | |||
120 | data = id->data; | 118 | data = id->data; |
121 | if (data) { | 119 | if (data) { |
122 | soc_dev_attr->soc_id = data->name; | 120 | soc_dev_attr->soc_id = data->name; |
@@ -132,6 +130,8 @@ static int __init imx8_soc_init(void) | |||
132 | if (IS_ERR(soc_dev)) | 130 | if (IS_ERR(soc_dev)) |
133 | goto free_rev; | 131 | goto free_rev; |
134 | 132 | ||
133 | of_node_put(root); | ||
134 | |||
135 | return 0; | 135 | return 0; |
136 | 136 | ||
137 | free_rev: | 137 | free_rev: |