* [PATCH] mmc: sdhci-cadence: Fix an error handling path in sdhci_cdns_probe()
@ 2023-04-25 13:41 Christophe JAILLET
2023-04-25 19:04 ` Adrian Hunter
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Christophe JAILLET @ 2023-04-25 13:41 UTC (permalink / raw)
To: Adrian Hunter, Ulf Hansson, Philipp Zabel, Brad Larson
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-mmc
If devm_reset_control_get_optional_exclusive() fails, some resources still
need to be released. So branch to the error handling path instead of
returning directly.
Fixes: aad53d4ee756 ("mmc: sdhci-cadence: Support mmc hardware reset")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/mmc/host/sdhci-cadence.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
index b24aa27da50c..d2f625054689 100644
--- a/drivers/mmc/host/sdhci-cadence.c
+++ b/drivers/mmc/host/sdhci-cadence.c
@@ -540,9 +540,11 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
if (host->mmc->caps & MMC_CAP_HW_RESET) {
priv->rst_hw = devm_reset_control_get_optional_exclusive(dev, NULL);
- if (IS_ERR(priv->rst_hw))
- return dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->rst_hw),
- "reset controller error\n");
+ if (IS_ERR(priv->rst_hw)) {
+ ret = dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->rst_hw),
+ "reset controller error\n");
+ goto free;
+ }
if (priv->rst_hw)
host->mmc_host_ops.card_hw_reset = sdhci_cdns_mmc_hw_reset;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] mmc: sdhci-cadence: Fix an error handling path in sdhci_cdns_probe()
2023-04-25 13:41 [PATCH] mmc: sdhci-cadence: Fix an error handling path in sdhci_cdns_probe() Christophe JAILLET
@ 2023-04-25 19:04 ` Adrian Hunter
2023-04-25 20:06 ` Brad Larson
2023-05-02 14:32 ` Ulf Hansson
2 siblings, 0 replies; 4+ messages in thread
From: Adrian Hunter @ 2023-04-25 19:04 UTC (permalink / raw)
To: Christophe JAILLET, Ulf Hansson, Philipp Zabel, Brad Larson
Cc: linux-kernel, kernel-janitors, linux-mmc
On 25/04/23 16:41, Christophe JAILLET wrote:
> If devm_reset_control_get_optional_exclusive() fails, some resources still
> need to be released. So branch to the error handling path instead of
> returning directly.
>
> Fixes: aad53d4ee756 ("mmc: sdhci-cadence: Support mmc hardware reset")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> drivers/mmc/host/sdhci-cadence.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
> index b24aa27da50c..d2f625054689 100644
> --- a/drivers/mmc/host/sdhci-cadence.c
> +++ b/drivers/mmc/host/sdhci-cadence.c
> @@ -540,9 +540,11 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
>
> if (host->mmc->caps & MMC_CAP_HW_RESET) {
> priv->rst_hw = devm_reset_control_get_optional_exclusive(dev, NULL);
> - if (IS_ERR(priv->rst_hw))
> - return dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->rst_hw),
> - "reset controller error\n");
> + if (IS_ERR(priv->rst_hw)) {
> + ret = dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->rst_hw),
> + "reset controller error\n");
> + goto free;
> + }
> if (priv->rst_hw)
> host->mmc_host_ops.card_hw_reset = sdhci_cdns_mmc_hw_reset;
> }
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mmc: sdhci-cadence: Fix an error handling path in sdhci_cdns_probe()
2023-04-25 13:41 [PATCH] mmc: sdhci-cadence: Fix an error handling path in sdhci_cdns_probe() Christophe JAILLET
2023-04-25 19:04 ` Adrian Hunter
@ 2023-04-25 20:06 ` Brad Larson
2023-05-02 14:32 ` Ulf Hansson
2 siblings, 0 replies; 4+ messages in thread
From: Brad Larson @ 2023-04-25 20:06 UTC (permalink / raw)
To: christophe.jaillet
Cc: adrian.hunter, blarson, kernel-janitors, linux-kernel, linux-mmc,
p.zabel, ulf.hansson
On 25/04/23 16:41, Christophe JAILLET wrote:
> If devm_reset_control_get_optional_exclusive() fails, some resources still
> need to be released. So branch to the error handling path instead of
> returning directly.
>
> Fixes: aad53d4ee756 ("mmc: sdhci-cadence: Support mmc hardware reset")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Brad Larson <blarson@amd.com>
> ---
> drivers/mmc/host/sdhci-cadence.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
> index b24aa27da50c..d2f625054689 100644
> --- a/drivers/mmc/host/sdhci-cadence.c
> +++ b/drivers/mmc/host/sdhci-cadence.c
> @@ -540,9 +540,11 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
>
> if (host->mmc->caps & MMC_CAP_HW_RESET) {
> priv->rst_hw = devm_reset_control_get_optional_exclusive(dev, NULL);
> - if (IS_ERR(priv->rst_hw))
> - return dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->rst_hw),
> - "reset controller error\n");
> + if (IS_ERR(priv->rst_hw)) {
> + ret = dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->rst_hw),
> + "reset controller error\n");
> + goto free;
> + }
> if (priv->rst_hw)
> host->mmc_host_ops.card_hw_reset = sdhci_cdns_mmc_hw_reset;
> }
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mmc: sdhci-cadence: Fix an error handling path in sdhci_cdns_probe()
2023-04-25 13:41 [PATCH] mmc: sdhci-cadence: Fix an error handling path in sdhci_cdns_probe() Christophe JAILLET
2023-04-25 19:04 ` Adrian Hunter
2023-04-25 20:06 ` Brad Larson
@ 2023-05-02 14:32 ` Ulf Hansson
2 siblings, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2023-05-02 14:32 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Adrian Hunter, Philipp Zabel, Brad Larson, linux-kernel,
kernel-janitors, linux-mmc
On Tue, 25 Apr 2023 at 15:41, Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
>
> If devm_reset_control_get_optional_exclusive() fails, some resources still
> need to be released. So branch to the error handling path instead of
> returning directly.
>
> Fixes: aad53d4ee756 ("mmc: sdhci-cadence: Support mmc hardware reset")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied for fixes, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci-cadence.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
> index b24aa27da50c..d2f625054689 100644
> --- a/drivers/mmc/host/sdhci-cadence.c
> +++ b/drivers/mmc/host/sdhci-cadence.c
> @@ -540,9 +540,11 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
>
> if (host->mmc->caps & MMC_CAP_HW_RESET) {
> priv->rst_hw = devm_reset_control_get_optional_exclusive(dev, NULL);
> - if (IS_ERR(priv->rst_hw))
> - return dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->rst_hw),
> - "reset controller error\n");
> + if (IS_ERR(priv->rst_hw)) {
> + ret = dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->rst_hw),
> + "reset controller error\n");
> + goto free;
> + }
> if (priv->rst_hw)
> host->mmc_host_ops.card_hw_reset = sdhci_cdns_mmc_hw_reset;
> }
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-02 14:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-25 13:41 [PATCH] mmc: sdhci-cadence: Fix an error handling path in sdhci_cdns_probe() Christophe JAILLET
2023-04-25 19:04 ` Adrian Hunter
2023-04-25 20:06 ` Brad Larson
2023-05-02 14:32 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox