From patchwork Tue May 5 08:54:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 6336061 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 37002BEEE1 for ; Tue, 5 May 2015 08:55:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 64E432010B for ; Tue, 5 May 2015 08:55:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3C12E20108 for ; Tue, 5 May 2015 08:55:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031033AbbEEIzG (ORCPT ); Tue, 5 May 2015 04:55:06 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:35832 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031013AbbEEIzD (ORCPT ); Tue, 5 May 2015 04:55:03 -0400 Received: by pdbqd1 with SMTP id qd1so189244759pdb.2 for ; Tue, 05 May 2015 01:55:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=bPEY28D6VjNCBZcy0Yai3g83tioOj2fd7MoIJ8pcACU=; b=m1UsmDRfvx4yyMjWjd4jb3rZ6T7QvTNoVpp4in6FAUXU8a1iI7tghpfx9LbyoelFlZ w9/1Q+KT0glFmcoVIl/LHHg+x2ji46+o+VvZ/wX9VKIX4fkgZatam6kQxOL7WJQ2N866 D5hLLTEB8RdTpZtpf/br30ctaUmSf6/lpbHdOQt1jUSAsps57zWmfWZ0D2+TKXG/H1Lo 8I0wpwJB+nna2erZPsmNJ6ddHAgiQ4cy1n7DXufnAV0oc4iIGrquYAreko5drY0AXind hQXLKuGyEPcEgBGEig9rjfhV2fefKdG/vwoquYNsan5eBcg8a4hlXN8a4T0YCqmhZrZy 88gA== X-Gm-Message-State: ALoCoQlAkVypBDTmAeKByNaGOIXbzROY0qwCB/WLtcNvVDN9P9050/lgJXDbLGX4UMi72fX255VY X-Received: by 10.70.44.199 with SMTP id g7mr49395043pdm.27.1430816102980; Tue, 05 May 2015 01:55:02 -0700 (PDT) Received: from localhost.localdomain ([180.150.157.4]) by mx.google.com with ESMTPSA id p1sm15206136pdl.60.2015.05.05.01.54.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 May 2015 01:55:01 -0700 (PDT) From: Zhangfei Gao To: Jaehoon Chung Cc: linux-mmc@vger.kernel.org, Zhangfei Gao Subject: [PATCH] mmc: dw_mmc: dw_mci_get_cd check MMC_CAP_NONREMOVABLE Date: Tue, 5 May 2015 16:54:49 +0800 Message-Id: <1430816089-8857-1-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When non-removable is used for emmc, MMC_CAP_NONREMOVABLE should also be checked, otherwise detection fail since present=0 Signed-off-by: Zhangfei Gao --- drivers/mmc/host/dw_mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 488a8af..5d327e4 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1308,7 +1308,8 @@ static int dw_mci_get_cd(struct mmc_host *mmc) 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) + if ((brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION) || + (mmc->caps & MMC_CAP_NONREMOVABLE)) present = 1; else if (!IS_ERR_VALUE(gpio_cd)) present = gpio_cd;