2020-04-17 15:53:28

by Colin King

Subject: [PATCH][next] sdhci: arasan: fix uninitialized value being returned as error code

From: Colin Ian King <[email protected]>

Currently the error return value in variable ret is not being initialized
and so a successful return path is returning a garbage value. Since ret
is not being used the simple fix is just return 0 on a successful return.

Addresses-Coverity: ("Uninitialized scalar variable")
Fixes: f73e66a36772 ("sdhci: arasan: Add support for Versal Tap Delays")
Signed-off-by: Colin Ian King <[email protected]>
---
drivers/mmc/host/sdhci-of-arasan.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
index 16e26c217a77..45603ba515b2 100644
--- a/drivers/mmc/host/sdhci-of-arasan.c
+++ b/drivers/mmc/host/sdhci-of-arasan.c
@@ -735,7 +735,6 @@ static int sdhci_versal_sdcardclk_set_phase(struct clk_hw *hw, int degrees)
container_of(clk_data, struct sdhci_arasan_data, clk_data);
struct sdhci_host *host = sdhci_arasan->host;
u8 tap_delay, tap_max = 0;
- int ret;

/*
* This is applicable for SDHCI_SPEC_300 and above
@@ -781,7 +780,7 @@ static int sdhci_versal_sdcardclk_set_phase(struct clk_hw *hw, int degrees)
sdhci_writel(host, regval, SDHCI_ARASAN_OTAPDLY_REGISTER);
}

- return ret;
+ return 0;
}

static const struct clk_ops versal_sdcardclk_ops = {
@@ -807,7 +806,6 @@ static int sdhci_versal_sampleclk_set_phase(struct clk_hw *hw, int degrees)
container_of(clk_data, struct sdhci_arasan_data, clk_data);
struct sdhci_host *host = sdhci_arasan->host;
u8 tap_delay, tap_max = 0;
- int ret;

/*
* This is applicable for SDHCI_SPEC_300 and above
@@ -857,7 +855,7 @@ static int sdhci_versal_sampleclk_set_phase(struct clk_hw *hw, int degrees)
sdhci_writel(host, regval, SDHCI_ARASAN_ITAPDLY_REGISTER);
}

- return ret;
+ return 0;
}

static const struct clk_ops versal_sampleclk_ops = {
--
2.25.1

2020-04-20 06:11:02

by Adrian Hunter

Subject: Re: [PATCH][next] sdhci: arasan: fix uninitialized value being returned as error code

On 17/04/20 6:49 pm, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Currently the error return value in variable ret is not being initialized
> and so a successful return path is returning a garbage value. Since ret
> is not being used the simple fix is just return 0 on a successful return.
>
> Addresses-Coverity: ("Uninitialized scalar variable")
> Fixes: f73e66a36772 ("sdhci: arasan: Add support for Versal Tap Delays")
> Signed-off-by: Colin Ian King <[email protected]>
> ---

Acked-by: Adrian Hunter <[email protected]>

> drivers/mmc/host/sdhci-of-arasan.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
> index 16e26c217a77..45603ba515b2 100644
> --- a/drivers/mmc/host/sdhci-of-arasan.c
> +++ b/drivers/mmc/host/sdhci-of-arasan.c
> @@ -735,7 +735,6 @@ static int sdhci_versal_sdcardclk_set_phase(struct clk_hw *hw, int degrees)
> container_of(clk_data, struct sdhci_arasan_data, clk_data);
> struct sdhci_host *host = sdhci_arasan->host;
> u8 tap_delay, tap_max = 0;
> - int ret;
>
> /*
> * This is applicable for SDHCI_SPEC_300 and above
> @@ -781,7 +780,7 @@ static int sdhci_versal_sdcardclk_set_phase(struct clk_hw *hw, int degrees)
> sdhci_writel(host, regval, SDHCI_ARASAN_OTAPDLY_REGISTER);
> }
>
> - return ret;
> + return 0;
> }
>
> static const struct clk_ops versal_sdcardclk_ops = {
> @@ -807,7 +806,6 @@ static int sdhci_versal_sampleclk_set_phase(struct clk_hw *hw, int degrees)
> container_of(clk_data, struct sdhci_arasan_data, clk_data);
> struct sdhci_host *host = sdhci_arasan->host;
> u8 tap_delay, tap_max = 0;
> - int ret;
>
> /*
> * This is applicable for SDHCI_SPEC_300 and above
> @@ -857,7 +855,7 @@ static int sdhci_versal_sampleclk_set_phase(struct clk_hw *hw, int degrees)
> sdhci_writel(host, regval, SDHCI_ARASAN_ITAPDLY_REGISTER);
> }
>
> - return ret;
> + return 0;
> }
>
> static const struct clk_ops versal_sampleclk_ops = {
>

2020-04-20 07:35:53

by Ulf Hansson

Subject: Re: [PATCH][next] sdhci: arasan: fix uninitialized value being returned as error code

On Fri, 17 Apr 2020 at 17:49, Colin King <[email protected]> wrote:
>
> From: Colin Ian King <[email protected]>
>
> Currently the error return value in variable ret is not being initialized
> and so a successful return path is returning a garbage value. Since ret
> is not being used the simple fix is just return 0 on a successful return.
>
> Addresses-Coverity: ("Uninitialized scalar variable")
> Fixes: f73e66a36772 ("sdhci: arasan: Add support for Versal Tap Delays")
> Signed-off-by: Colin Ian King <[email protected]>

Thanks for the patch, but this time I have already applied [1] an
earlier fix for it.

Kind regards
Uffe

[...]

[1] https://patchwork.kernel.org/patch/11493633/