mmc: loongson2: Fix error code in loongson2_mmc_resource_request()

[PATCH next] mmc: loongson2: Fix error code in loongson2_mmc_resource_request()

Posted by Dan Carpenter 6 months, 3 weeks ago

There is a cut and paste bug so we accidentally return the wrong
variable.  It should be "ret" instead of PTR_ERR(host->clk).

Fixes: 2115772014bd ("mmc: loongson2: Add Loongson-2K SD/SDIO controller driver")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 drivers/mmc/host/loongson2-mmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/host/loongson2-mmc.c b/drivers/mmc/host/loongson2-mmc.c
index ba6bb8fd5535..63d01d2cd978 100644
--- a/drivers/mmc/host/loongson2-mmc.c
+++ b/drivers/mmc/host/loongson2-mmc.c
@@ -887,7 +887,7 @@ static int loongson2_mmc_resource_request(struct platform_device *pdev,
 	if (host->clk) {
 		ret = devm_clk_rate_exclusive_get(dev, host->clk);
 		if (ret)
-			return PTR_ERR(host->clk);
+			return ret;
 
 		host->current_clk = clk_get_rate(host->clk);
 	} else {
-- 
2.47.2

Re: [PATCH next] mmc: loongson2: Fix error code in loongson2_mmc_resource_request()

Posted by Ulf Hansson 6 months, 3 weeks ago

On Wed, 16 Jul 2025 at 01:01, Dan Carpenter <dan.carpenter@linaro.org> wrote:
>
> There is a cut and paste bug so we accidentally return the wrong
> variable.  It should be "ret" instead of PTR_ERR(host->clk).
>
> Fixes: 2115772014bd ("mmc: loongson2: Add Loongson-2K SD/SDIO controller driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/loongson2-mmc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/loongson2-mmc.c b/drivers/mmc/host/loongson2-mmc.c
> index ba6bb8fd5535..63d01d2cd978 100644
> --- a/drivers/mmc/host/loongson2-mmc.c
> +++ b/drivers/mmc/host/loongson2-mmc.c
> @@ -887,7 +887,7 @@ static int loongson2_mmc_resource_request(struct platform_device *pdev,
>         if (host->clk) {
>                 ret = devm_clk_rate_exclusive_get(dev, host->clk);
>                 if (ret)
> -                       return PTR_ERR(host->clk);
> +                       return ret;
>
>                 host->current_clk = clk_get_rate(host->clk);
>         } else {
> --
> 2.47.2
>

Re: [PATCH next] mmc: loongson2: Fix error code in loongson2_mmc_resource_request()

Posted by Binbin Zhou 6 months, 3 weeks ago

Hi Dan:

Ah, sorry  for my cheap fault, and thanks for your patch.

On 2025/7/16 07:00, Dan Carpenter wrote:
> There is a cut and paste bug so we accidentally return the wrong
> variable.  It should be "ret" instead of PTR_ERR(host->clk).
>
> Fixes: 2115772014bd ("mmc: loongson2: Add Loongson-2K SD/SDIO controller driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>


Reviewed-by: Binbin Zhou <zhoubinbin@loongson.cn>

> ---
>   drivers/mmc/host/loongson2-mmc.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/loongson2-mmc.c b/drivers/mmc/host/loongson2-mmc.c
> index ba6bb8fd5535..63d01d2cd978 100644
> --- a/drivers/mmc/host/loongson2-mmc.c
> +++ b/drivers/mmc/host/loongson2-mmc.c
> @@ -887,7 +887,7 @@ static int loongson2_mmc_resource_request(struct platform_device *pdev,
>   	if (host->clk) {
>   		ret = devm_clk_rate_exclusive_get(dev, host->clk);
>   		if (ret)
> -			return PTR_ERR(host->clk);
> +			return ret;
>   
>   		host->current_clk = clk_get_rate(host->clk);
>   	} else {


Thanks.
Binbin