[PATCH] SDHCI: Modify checks to determine the presense of card.

[PATCH] SDHCI: Modify checks to determine the presense of card.

[Thomas Abraham]

In the sdhci_request function, the card is determined to be present based
on the SDCD pin status. SDHCI host controllers that do not use SDCD pin
but rely on other mechanism such as external pin interrupts, update the
host flags with SDHCI_DEVICE_DEAD flag based on the card insertion status.
This patch modifies the sdhci_request function such that the it uses
both the SDCD status and SDHCI_DEVICE_DEAD host flag to determine if the
card is inserted or not.

Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
---
 drivers/mmc/host/sdhci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c279fbc..f1a6ebe 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1106,7 +1106,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 		present = sdhci_readl(host, SDHCI_PRESENT_STATE) &
 				SDHCI_CARD_PRESENT;
 
-	if (!present || host->flags & SDHCI_DEVICE_DEAD) {
+	if (!present && host->flags & SDHCI_DEVICE_DEAD) {
 		host->mrq->cmd->error = -ENOMEDIUM;
 		tasklet_schedule(&host->finish_tasklet);
 	} else
-- 
1.6.6.rc2

Re: [PATCH] SDHCI: Modify checks to determine the presense of card.

[Chris Ball]

Hi,

This wasn't picked up -- any comments from the list?

On Fri, Mar 05, 2010 at 12:29:37PM +0530, Thomas Abraham wrote:
> In the sdhci_request function, the card is determined to be present based
> on the SDCD pin status. SDHCI host controllers that do not use SDCD pin
> but rely on other mechanism such as external pin interrupts, update the
> host flags with SDHCI_DEVICE_DEAD flag based on the card insertion status.
> This patch modifies the sdhci_request function such that the it uses
> both the SDCD status and SDHCI_DEVICE_DEAD host flag to determine if the
> card is inserted or not.
> 
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> ---
>  drivers/mmc/host/sdhci.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index c279fbc..f1a6ebe 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1106,7 +1106,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
>  		present = sdhci_readl(host, SDHCI_PRESENT_STATE) &
>  				SDHCI_CARD_PRESENT;
>  
> -	if (!present || host->flags & SDHCI_DEVICE_DEAD) {
> +	if (!present && host->flags & SDHCI_DEVICE_DEAD) {
>  		host->mrq->cmd->error = -ENOMEDIUM;
>  		tasklet_schedule(&host->finish_tasklet);
>  	} else
> -- 
> 1.6.6.rc2

-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child