On Wed, January 15, 2014, Zhangfei Gao wrote:

On 01/15/2014 07:58 PM, Seungwon Jeon wrote:

quoted

On Wed, January 15, 2014, Zhangfei Gao wrote:

quoted

Introduced from commit bf626e5550f24aec24975a0e85ad8e572ca76a6b
CDETECT is ignored since negated return value of mmc_gpio_get_cd(mmc)
can not be checked by IS_ERR_VALUE.
Add spin_lock_bh(&host->lock) for atomic accessing DW_MMC_CARD_PRESENT,
otherwise sd detect may occasionally fail.

Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Reported-by: Kevin Hilman <redacted>
Reviewed-by: Sachin Kamat <redacted>
Tested-by: Sachin Kamat <redacted>
---
  drivers/mmc/host/dw_mmc.c |    9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index a776f24f4311..9ded62c8225e 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c

@@ -1033,7 +1033,8 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
  	int present;
  	struct dw_mci_slot *slot = mmc_priv(mmc);
  	struct dw_mci_board *brd = slot->host->pdata;
-	int gpio_cd = !mmc_gpio_get_cd(mmc);
+	struct dw_mci *host = slot->host;
+	int gpio_cd = mmc_gpio_get_cd(mmc);

  	/* Use platform get_cd function, else try onboard card detect */
  	if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)

@@ -1041,11 +1042,12 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
  	else if (brd->get_cd)
  		present = !brd->get_cd(slot->id);
  	else if (!IS_ERR_VALUE(gpio_cd))
-		present = !!gpio_cd;
+		present = !gpio_cd;

!!gpio_cd or gpio_cd is correct, isn't it?

No, mmc_gpio_get_cd(mmc) has to revert.

I'm missing something?
If card is detected, mmc_gpio_get_cd() returns non-zero, right?
I guess gpio_cd should be kept.

!!gpio_cd is used before since gpio_cd = !mmc_gpio_get_cd(mmc) is used
before.

Thanks
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html