From patchwork Mon Jun 20 10:38:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 2071 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4982823E02 for ; Mon, 20 Jun 2011 10:29:15 +0000 (UTC) Received: from mail-vw0-f52.google.com (mail-vw0-f52.google.com [209.85.212.52]) by fiordland.canonical.com (Postfix) with ESMTP id 196E7A18722 for ; Mon, 20 Jun 2011 10:29:15 +0000 (UTC) Received: by vws16 with SMTP id 16so3346098vws.11 for ; Mon, 20 Jun 2011 03:29:14 -0700 (PDT) Received: by 10.52.175.197 with SMTP id cc5mr3224118vdc.287.1308565754537; Mon, 20 Jun 2011 03:29:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.52.183.130 with SMTP id em2cs23176vdc; Mon, 20 Jun 2011 03:29:14 -0700 (PDT) Received: by 10.42.145.138 with SMTP id f10mr6054788icv.469.1308565753681; Mon, 20 Jun 2011 03:29:13 -0700 (PDT) Received: from mail-iw0-f178.google.com (mail-iw0-f178.google.com [209.85.214.178]) by mx.google.com with ESMTPS id s5si5975842ibd.137.2011.06.20.03.29.13 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Jun 2011 03:29:13 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.178 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.214.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.178 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by mail-iw0-f178.google.com with SMTP id 10so1699588iwc.37 for ; Mon, 20 Jun 2011 03:29:13 -0700 (PDT) Received: by 10.231.116.32 with SMTP id k32mr5149303ibq.119.1308565753399; Mon, 20 Jun 2011 03:29:13 -0700 (PDT) Received: from localhost.localdomain ([58.208.97.176]) by mx.google.com with ESMTPS id d10sm3113114ibb.32.2011.06.20.03.29.05 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Jun 2011 03:29:12 -0700 (PDT) From: Shawn Guo To: linux-mmc@vger.kernel.org Cc: Chris Ball , Wolfram Sang , Arnaud Patard , Eric Benard , linux-arm-kernel@lists.infradead.org, patches@linaro.org, Shawn Guo Subject: [PATCH v3 2/4] mmc: sdhci-esdhc-imx: SDHCI_CARD_PRESENT does not get cleared Date: Mon, 20 Jun 2011 18:38:43 +0800 Message-Id: <1308566325-11600-3-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1308566325-11600-1-git-send-email-shawn.guo@linaro.org> References: <1308566325-11600-1-git-send-email-shawn.guo@linaro.org> The function esdhc_readl_le intends to clear bit SDHCI_CARD_PRESENT, when the card detect gpio tells there is no card. But it does not clear the bit actually. The patch gives a fix on that. Signed-off-by: Shawn Guo Acked-by: Wolfram Sang --- drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 248b8e5..94097c0 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -84,7 +84,7 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg) if (boarddata && gpio_is_valid(boarddata->cd_gpio) && gpio_get_value(boarddata->cd_gpio)) /* no card, if a valid gpio says so... */ - val &= SDHCI_CARD_PRESENT; + val &= ~SDHCI_CARD_PRESENT; else /* ... in all other cases assume card is present */ val |= SDHCI_CARD_PRESENT;