mmc: tmio: populate correct callback when using GPIO CD
diff mbox

Message ID 20180304224933.17498-1-wsa+renesas@sang-engineering.com
State Under Review
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Wolfram Sang March 4, 2018, 10:49 p.m. UTC
The patch "mmc: tmio: support IP-builtin card detection logic" had a
typo and populated RO instead of CD. Fix it.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Ulf: I didn't add a Fixes: tag because you used to sometimes rebase your
for-next branch and thus the tag would dangle then. Do you still do that BTW?

 drivers/mmc/host/tmio_mmc_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ulf Hansson March 5, 2018, 8:45 a.m. UTC | #1
On 4 March 2018 at 23:49, Wolfram Sang <wsa+renesas@sang-engineering.com> wrote:
> The patch "mmc: tmio: support IP-builtin card detection logic" had a
> typo and populated RO instead of CD. Fix it.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
>
> Ulf: I didn't add a Fixes: tag because you used to sometimes rebase your
> for-next branch and thus the tag would dangle then. Do you still do that BTW?

No need for a fixes tag, just pointing to the commit as you do in the
changelog is perfectly fine to me.

And yes, I am re-basing my branch from time to time. Until I find the
positive effects of doing so, to become less than the negative, then I
will keep doing it.

>
>  drivers/mmc/host/tmio_mmc_core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
> index d82dfea381727e..e30df9ad8197c4 100644
> --- a/drivers/mmc/host/tmio_mmc_core.c
> +++ b/drivers/mmc/host/tmio_mmc_core.c
> @@ -1244,7 +1244,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host)
>                 _host->ops.get_ro = mmc_gpio_get_ro;
>
>         if (mmc_can_gpio_cd(mmc))
> -               _host->ops.get_ro = mmc_gpio_get_cd;
> +               _host->ops.get_cd = mmc_gpio_get_cd;
>
>         _host->native_hotplug = !(mmc_can_gpio_cd(mmc) ||
>                                   mmc->caps & MMC_CAP_NEEDS_POLL ||
> --
> 2.11.0
>

Applied for next!

Kind regards
Uffe

Patch
diff mbox

diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index d82dfea381727e..e30df9ad8197c4 100644
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -1244,7 +1244,7 @@  int tmio_mmc_host_probe(struct tmio_mmc_host *_host)
 		_host->ops.get_ro = mmc_gpio_get_ro;
 
 	if (mmc_can_gpio_cd(mmc))
-		_host->ops.get_ro = mmc_gpio_get_cd;
+		_host->ops.get_cd = mmc_gpio_get_cd;
 
 	_host->native_hotplug = !(mmc_can_gpio_cd(mmc) ||
 				  mmc->caps & MMC_CAP_NEEDS_POLL ||