mmc: tegra: fix inconsistent IS_ERR and PTR_ERR
diff mbox series

Message ID 20180904025909.13700-1-yuehaibing@huawei.com
State New
Headers show
Series
  • mmc: tegra: fix inconsistent IS_ERR and PTR_ERR
Related show

Commit Message

YueHaibing Sept. 4, 2018, 2:59 a.m. UTC
Fix inconsistent IS_ERR and PTR_ERR in tegra_sdhci_init_pinctrl_info,
the proper pointer to be passed as argument is 'pinctrl_state_1v8'

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/mmc/host/sdhci-tegra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Aapo Vienamo Sept. 4, 2018, 10:13 a.m. UTC | #1
On Tue, 4 Sep 2018 10:59:09 +0800
YueHaibing <yuehaibing@huawei.com> wrote:

> Fix inconsistent IS_ERR and PTR_ERR in tegra_sdhci_init_pinctrl_info,
> the proper pointer to be passed as argument is 'pinctrl_state_1v8'
> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Reviewed-by: Aapo Vienamo <aapo.vienamo@iki.fi>

> ---
>  drivers/mmc/host/sdhci-tegra.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index e80716c..c789158 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -724,7 +724,7 @@ static int tegra_sdhci_init_pinctrl_info(struct device *dev,
>  		pinctrl_lookup_state(tegra_host->pinctrl_sdmmc, "sdmmc-1v8");
>  	if (IS_ERR(tegra_host->pinctrl_state_1v8)) {
>  		dev_warn(dev, "Missing 1.8V pad state, err: %ld\n",
> -			 PTR_ERR(tegra_host->pinctrl_state_3v3));
> +			 PTR_ERR(tegra_host->pinctrl_state_1v8));
>  		return -1;
>  	}
>
Ulf Hansson Sept. 4, 2018, 2:34 p.m. UTC | #2
On 4 September 2018 at 04:59, YueHaibing <yuehaibing@huawei.com> wrote:
> Fix inconsistent IS_ERR and PTR_ERR in tegra_sdhci_init_pinctrl_info,
> the proper pointer to be passed as argument is 'pinctrl_state_1v8'
>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Thanks, applied for next!

Kind regards
Uffe

> ---
>  drivers/mmc/host/sdhci-tegra.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index e80716c..c789158 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -724,7 +724,7 @@ static int tegra_sdhci_init_pinctrl_info(struct device *dev,
>                 pinctrl_lookup_state(tegra_host->pinctrl_sdmmc, "sdmmc-1v8");
>         if (IS_ERR(tegra_host->pinctrl_state_1v8)) {
>                 dev_warn(dev, "Missing 1.8V pad state, err: %ld\n",
> -                        PTR_ERR(tegra_host->pinctrl_state_3v3));
> +                        PTR_ERR(tegra_host->pinctrl_state_1v8));
>                 return -1;
>         }
>
> --
> 2.7.0
>
>

Patch
diff mbox series

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index e80716c..c789158 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -724,7 +724,7 @@  static int tegra_sdhci_init_pinctrl_info(struct device *dev,
 		pinctrl_lookup_state(tegra_host->pinctrl_sdmmc, "sdmmc-1v8");
 	if (IS_ERR(tegra_host->pinctrl_state_1v8)) {
 		dev_warn(dev, "Missing 1.8V pad state, err: %ld\n",
-			 PTR_ERR(tegra_host->pinctrl_state_3v3));
+			 PTR_ERR(tegra_host->pinctrl_state_1v8));
 		return -1;
 	}