mmc: sdhci-esdhc-imx: Check the return value from clk_prepare_enable()
Subsystems (4)
Fabio Estevam
reviewerPATCH RESEND 1/1 mmc: sdhci-esdhc-imx: Check the return value from clk_prepare_enable()
From: Fabio Estevam <[email protected]>
clk_prepare_enable() may fail, so we should better check its return value and propagate it in the case of error.
Signed-off-by Fabio Estevam <[email protected]>
--- drivers/mmc/host/sdhci-esdhc-imx.c | 54 +++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 13 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +41 -13
@@ -1250,14 +1250,20 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) pltfm_host->clk = imx_data->clk_per; pltfm_host->clock =clk_get_rate (pltfm_host->clk); -clk_prepare_enable (imx_data->clk_per); -clk_prepare_enable (imx_data->clk_ipg); -clk_prepare_enable (imx_data->clk_ahb); + err =clk_prepare_enable (imx_data->clk_per); +if (err) + goto free_sdhci; + err =clk_prepare_enable (imx_data->clk_ipg); +if (err) + goto disable_per_clk; + err =clk_prepare_enable (imx_data->clk_ahb); +if (err) + goto disable_ipg_clk; imx_data->pinctrl =devm_pinctrl_get (&pdev->dev);if (IS_ERR (imx_data->pinctrl)) { err =PTR_ERR (imx_data->pinctrl); - goto disable_clk; + goto disable_ahb_clk; } imx_data->pins_default = pinctrl_lookup_state(imx_data->pinctrl,
@@ -1297,13 +1303,13 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)else err =sdhci_esdhc_imx_probe_nondt (pdev, host, imx_data);if (err) - goto disable_clk; + goto disable_ahb_clk;sdhci_esdhc_imx_hwinit (host); err =sdhci_add_host (host);if (err) - goto disable_clk; + goto disable_ahb_clk;pm_runtime_set_active (&pdev->dev);pm_runtime_set_autosuspend_delay (&pdev->dev,50 );
@@ -1313,10 +1319,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)return 0 ; -disable_clk: -clk_disable_unprepare (imx_data->clk_per); -clk_disable_unprepare (imx_data->clk_ipg); +disable_ahb_clk:clk_disable_unprepare (imx_data->clk_ahb); +disable_ipg_clk: +clk_disable_unprepare (imx_data->clk_ipg); +disable_per_clk: +clk_disable_unprepare (imx_data->clk_per); free_sdhci:sdhci_pltfm_free (pdev);return err;
@@ -1393,14 +1401,34 @@ static int sdhci_esdhc_runtime_resume(struct device *dev)struct sdhci_host *host =dev_get_drvdata (dev);struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);struct pltfm_imx_data *imx_data =sdhci_pltfm_priv (pltfm_host); +int err;if (!sdhci_sdio_irq_enabled (host)) { -clk_prepare_enable (imx_data->clk_per); -clk_prepare_enable (imx_data->clk_ipg); + err =clk_prepare_enable (imx_data->clk_per); +if (err) +return err; + err =clk_prepare_enable (imx_data->clk_ipg); +if (err) + goto disable_per_clk; } -clk_prepare_enable (imx_data->clk_ahb); + err =clk_prepare_enable (imx_data->clk_ahb); +if (err) + goto disable_ipg_clk; + err =sdhci_runtime_resume_host (host); +if (err) + goto disable_ahb_clk; + +return 0 ; - return sdhci_runtime_resume_host(host); +disable_ahb_clk: +clk_disable_unprepare (imx_data->clk_ahb); +disable_ipg_clk: +if (!sdhci_sdio_irq_enabled (host)) +clk_disable_unprepare (imx_data->clk_ipg); +disable_per_clk: +if (!sdhci_sdio_irq_enabled (host)) +clk_disable_unprepare (imx_data->clk_per); + return err; }#endif
Signature · 1 line
2.7.4
Ulf Hansson
AppliedQuoted 6 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
clk_prepare_enable()may fail, so we should better check its return value and propagate it in the case of error.Signed-off-by Fabio Estevam <[email protected]>
Thanks, applied for next!
Kind regards
Uffe
Quoted 107 lines
--- drivers/mmc/host/sdhci-esdhc-imx.c | 54 +++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 13 deletions(-)drivers/mmc/host/sdhci-esdhc-imx.c +41
-14@@ -1250,14 +1250,20 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) pltfm_host->clk = imx_data->clk_per; pltfm_host->clock =clk_get_rate (pltfm_host->clk); -clk_prepare_enable (imx_data->clk_per); -clk_prepare_enable (imx_data->clk_ipg); -clk_prepare_enable (imx_data->clk_ahb); + err =clk_prepare_enable (imx_data->clk_per); +if (err) + goto free_sdhci; + err =clk_prepare_enable (imx_data->clk_ipg); +if (err) + goto disable_per_clk; + err =clk_prepare_enable (imx_data->clk_ahb); +if (err) + goto disable_ipg_clk; imx_data->pinctrl =devm_pinctrl_get (&pdev->dev);if (IS_ERR (imx_data->pinctrl)) { err =PTR_ERR (imx_data->pinctrl); - goto disable_clk; + goto disable_ahb_clk; } imx_data->pins_default = pinctrl_lookup_state(imx_data->pinctrl,@@ -1297,13 +1303,13 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)else err =sdhci_esdhc_imx_probe_nondt (pdev, host, imx_data);if (err) - goto disable_clk; + goto disable_ahb_clk;sdhci_esdhc_imx_hwinit (host); err =sdhci_add_host (host);if (err) - goto disable_clk; + goto disable_ahb_clk;pm_runtime_set_active (&pdev->dev);pm_runtime_set_autosuspend_delay (&pdev->dev,50 );@@ -1313,10 +1319,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)return 0 ; -disable_clk: -clk_disable_unprepare (imx_data->clk_per); -clk_disable_unprepare (imx_data->clk_ipg); +disable_ahb_clk:clk_disable_unprepare (imx_data->clk_ahb); +disable_ipg_clk: +clk_disable_unprepare (imx_data->clk_ipg); +disable_per_clk: +clk_disable_unprepare (imx_data->clk_per); free_sdhci:sdhci_pltfm_free (pdev);return err;@@ -1393,14 +1401,34 @@ static int sdhci_esdhc_runtime_resume(struct device *dev)struct sdhci_host *host =dev_get_drvdata (dev);struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);struct pltfm_imx_data *imx_data =sdhci_pltfm_priv (pltfm_host); +int err;if (!sdhci_sdio_irq_enabled (host)) { -clk_prepare_enable (imx_data->clk_per); -clk_prepare_enable (imx_data->clk_ipg); + err =clk_prepare_enable (imx_data->clk_per); +if (err) +return err; + err =clk_prepare_enable (imx_data->clk_ipg); +if (err) + goto disable_per_clk; } -clk_prepare_enable (imx_data->clk_ahb); + err =clk_prepare_enable (imx_data->clk_ahb); +if (err) + goto disable_ipg_clk; + err =sdhci_runtime_resume_host (host); +if (err) + goto disable_ahb_clk; + +return 0 ; -return sdhci_runtime_resume_host (host); +disable_ahb_clk: +clk_disable_unprepare (imx_data->clk_ahb); +disable_ipg_clk: +if (!sdhci_sdio_irq_enabled (host)) +clk_disable_unprepare (imx_data->clk_ipg); +disable_per_clk: +if (!sdhci_sdio_irq_enabled (host)) +clk_disable_unprepare (imx_data->clk_per); + return err; }#endif --2.7.4