of_node_put() supports NULL as its argument, so the initial test is not necessary.

Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- sound/soc/fsl/imx-sgtl5000.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index 1cb22dd..1dab963 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -175,10 +175,8 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) fail: if (data && !IS_ERR(data->codec_clk)) clk_put(data->codec_clk); - if (ssi_np) - of_node_put(ssi_np); - if (codec_np) - of_node_put(codec_np); + of_node_put(ssi_np); + of_node_put(codec_np);

return ret; }

On Tue, Oct 07, 2014 at 03:13:24PM -0300, Fabio Estevam wrote:

of_node_put() supports NULL as its argument, so the initial test is not necessary.

Signed-off-by: Fabio Estevam fabio.estevam@freescale.com

For both two patches:

Acked-by: Nicolin Chen nicoleotsuka@gmail.com

Thank you Nic

---

sound/soc/fsl/imx-wm8962.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c index 3a3d17c..48179ff 100644 --- a/sound/soc/fsl/imx-wm8962.c +++ b/sound/soc/fsl/imx-wm8962.c @@ -281,10 +281,8 @@ static int imx_wm8962_probe(struct platform_device *pdev) clk_fail: clk_disable_unprepare(data->codec_clk); fail:

• if (ssi_np)

• of_node_put(ssi_np);
  

• if (codec_np)

• of_node_put(codec_np);
  

• of_node_put(ssi_np);

• of_node_put(codec_np);

  return ret;

}

1.9.1