memory: atmel-ebi: Fix missing of_node_put in atmel_ebi_probe
Subsystems (2)
PATCH 1/1 memory: atmel-ebi: Fix missing of_node_put in atmel_ebi_probe
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/memory/atmel-ebi.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/memory/atmel-ebi.c +17 -6
@@ -544,20 +544,27 @@ static int atmel_ebi_probe(struct platform_device *pdev) smc_np =of_parse_phandle (dev->of_node,"atmel,smc" ,0 ); ebi->smc.regmap =syscon_node_to_regmap (smc_np); -if (IS_ERR (ebi->smc.regmap)) -return PTR_ERR (ebi->smc.regmap); +if (IS_ERR (ebi->smc.regmap)) { + ret =PTR_ERR (ebi->smc.regmap); + goto put_node; + } ebi->smc.layout =atmel_hsmc_get_reg_layout (smc_np); -if (IS_ERR (ebi->smc.layout)) -return PTR_ERR (ebi->smc.layout); +if (IS_ERR (ebi->smc.layout)) { + ret =PTR_ERR (ebi->smc.layout); + goto put_node; + } ebi->smc.clk =of_clk_get (smc_np,0 );if (IS_ERR (ebi->smc.clk)) { -if (PTR_ERR (ebi->smc.clk) != -ENOENT ) -return PTR_ERR (ebi->smc.clk); +if (PTR_ERR (ebi->smc.clk) != -ENOENT ) { + ret =PTR_ERR (ebi->smc.clk); + goto put_node; + } ebi->smc.clk =NULL ; } +of_node_put (smc_np); ret =clk_prepare_enable (ebi->smc.clk);if (ret)return ret;
@@ -608,6 +615,10 @@ static int atmel_ebi_probe(struct platform_device *pdev) }return of_platform_populate (np,NULL ,NULL , dev); + +put_node: +of_node_put (smc_np); +return ret; }static __maybe_unused int atmel_ebi_resume (struct device *dev)
Signature · 1 line
2.17.1
Quoted 7 lines · Miaoqian Lin
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
The
device_nodepointer is returned byof_parse_phandle()with refcount incremented. We should useof_node_put()on it when done.Fixes 87108dc78eb8 ("memory: atmel-ebi: Enable the SMC clock if specified")Signed-off-by Miaoqian Lin <[email protected]>
Quoted 56 lines
--- drivers/memory/atmel-ebi.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)drivers/memory/atmel-ebi.c +17
-7@@ -544,20 +544,27 @@ static int atmel_ebi_probe(struct platform_device *pdev) smc_np =of_parse_phandle (dev->of_node,"atmel,smc" ,0 ); ebi->smc.regmap =syscon_node_to_regmap (smc_np); -if (IS_ERR (ebi->smc.regmap)) -return PTR_ERR (ebi->smc.regmap); +if (IS_ERR (ebi->smc.regmap)) { + ret =PTR_ERR (ebi->smc.regmap); + goto put_node; + } ebi->smc.layout =atmel_hsmc_get_reg_layout (smc_np); -if (IS_ERR (ebi->smc.layout)) -return PTR_ERR (ebi->smc.layout); +if (IS_ERR (ebi->smc.layout)) { + ret =PTR_ERR (ebi->smc.layout); + goto put_node; + } ebi->smc.clk =of_clk_get (smc_np,0 );if (IS_ERR (ebi->smc.clk)) { -if (PTR_ERR (ebi->smc.clk) != -ENOENT ) -return PTR_ERR (ebi->smc.clk); +if (PTR_ERR (ebi->smc.clk) != -ENOENT ) { + ret =PTR_ERR (ebi->smc.clk); + goto put_node; + } ebi->smc.clk =NULL ; } +of_node_put (smc_np); ret =clk_prepare_enable (ebi->smc.clk);if (ret)return ret;@@ -608,6 +615,10 @@ static int atmel_ebi_probe(struct platform_device *pdev) }return of_platform_populate (np,NULL ,NULL , dev); + +put_node: +of_node_put (smc_np); +return ret; }static __maybe_unused int atmel_ebi_resume (struct device *dev) --2.17.1
Krzysztof Kozlowski
maintainerQuoted 9 lines · Miaoqian Lin
The
device_nodepointer is returned byof_parse_phandle()with refcount incremented. We should useof_node_put()on it when done.Fixes 87108dc78eb8 ("memory: atmel-ebi: Enable the SMC clock if specified")Signed-off-by Miaoqian Lin <[email protected]>--- drivers/memory/atmel-ebi.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
It's too late for upcoming cycle, so I will pick it up after the merge window.
Best regards,
Krzysztof
Krzysztof Kozlowski
AppliedQuoted 4 lines · Miaoqian Lin
The
device_nodepointer is returned byof_parse_phandle()with refcount incremented. We should useof_node_put()on it when done.
Applied, thanks!
[1/1] memory: atmel-ebi: Fix missing of_node_put in atmel_ebi_probe
commit: 6f296a9665ba5ac68937bf11f96214eb9de81baa
Best regards,
Signature · 6 lines
Krzysztof Kozlowski <[email protected]> _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel