diff mbox

[v4,7/7] mmc: dw_mmc: restore the card-present checking point

Message ID 5313EAC0.9040600@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jaehoon Chung March 3, 2014, 2:36 a.m. UTC
Restore the card-present cheching point.
(The following part was removed from commit bf626e5(mmc: dw_mmc: use slot-gpio to handle cd pin).)

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
 drivers/mmc/host/dw_mmc.c |    5 +++++
 1 file changed, 5 insertions(+)

Comments

Ulf Hansson March 6, 2014, 7:36 a.m. UTC | #1
On 3 March 2014 03:36, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> Restore the card-present cheching point.
> (The following part was removed from commit bf626e5(mmc: dw_mmc: use slot-gpio to handle cd pin).)
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

Acked-by: Ulf Hansson <ulf.hansson@linaro.org>

> ---
>  drivers/mmc/host/dw_mmc.c |    5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 22184c1..ab4c86d 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -2113,6 +2113,11 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
>  #endif /* CONFIG_MMC_DW_IDMAC */
>         }
>
> +       if (dw_mci_get_cd(mmc))
> +               set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
> +       else
> +               clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
> +
>         ret = mmc_add_host(mmc);
>         if (ret)
>                 goto err_setup_bus;
> --
> 1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 22184c1..ab4c86d 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2113,6 +2113,11 @@  static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
 #endif /* CONFIG_MMC_DW_IDMAC */
 	}
 
+	if (dw_mci_get_cd(mmc))
+		set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
+	else
+		clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
+
 	ret = mmc_add_host(mmc);
 	if (ret)
 		goto err_setup_bus;