On Sun, Jun 09, 2013 at 10:07:46PM -0300, Fabio Estevam wrote:
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index a60aaa0..823151b 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -129,20 +129,10 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) }
data->codec_clk = clk_get(&codec_dev->dev, NULL);
- if (IS_ERR(data->codec_clk)) {
/* assuming clock enabled by default */data->codec_clk = NULL;ret = of_property_read_u32(codec_np, "clock-frequency",&data->clk_frequency);if (ret) {dev_err(&codec_dev->dev,"clock-frequency missing or invalid\n");goto fail;}- } else {
data->clk_frequency = clk_get_rate(data->codec_clk);clk_prepare_enable(data->codec_clk);- }
if (IS_ERR(data->codec_clk))
goto fail;data->clk_frequency = clk_get_rate(data->codec_clk);
data->dai.name = "HiFi"; data->dai.stream_name = "HiFi";
@@ -157,10 +147,10 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) data->card.dev = &pdev->dev; ret = snd_soc_of_parse_card_name(&data->card, "model"); if (ret)
goto clk_fail;
goto fail;
goto clk_fail;
goto fail;@@ -170,7 +160,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) ret = snd_soc_register_card(&data->card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
goto clk_fail;
goto fail;}
platform_set_drvdata(pdev, data);
@@ -179,8 +169,6 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
return 0;
-clk_fail:
- clk_put(data->codec_clk);
Why can this clk_put() be removed now?
fail: if (ssi_np) of_node_put(ssi_np); @@ -194,10 +182,6 @@ static int imx_sgtl5000_remove(struct platform_device *pdev) { struct imx_sgtl5000_data *data = platform_get_drvdata(pdev);
- if (data->codec_clk) {
clk_disable_unprepare(data->codec_clk);clk_put(data->codec_clk);
Ditto
Shawn
} snd_soc_unregister_card(&data->card);
return 0;
-- 1.8.1.2