From patchwork Mon Sep 27 08:42:20 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Matt Fleming <matt@console-pimps.org>
X-Patchwork-Id: 211462
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8R8dp0b015315
	for <patchwork-linux-mmc@patchwork.kernel.org>;
	Mon, 27 Sep 2010 08:42:24 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752833Ab0I0ImY (ORCPT
	<rfc822;patchwork-linux-mmc@patchwork.kernel.org>);
	Mon, 27 Sep 2010 04:42:24 -0400
Received: from arkanian.console-pimps.org ([212.110.184.194]:44854 "EHLO
	arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1758914Ab0I0ImX (ORCPT
	<rfc822; linux-mmc@vger.kernel.org>); Mon, 27 Sep 2010 04:42:23 -0400
Received: by arkanian.console-pimps.org (Postfix, from userid 1000)
	id 39BB244330; Mon, 27 Sep 2010 09:42:20 +0100 (BST)
From: Matt Fleming <matt@console-pimps.org>
To: Chris Ball <cjb@laptop.org>
Cc: Jaehoon Chung <jh80.chung@samsung.com>, linux-mmc@vger.kernel.org,
	Kyungmin Park <kyungmin.park@samsung.com>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Ben Hutchings <ben@decadent.org.uk>, Yunpeng Gao <yunpeng.gao@intel.com>,
	zhangfei gao <zhangfei.gao@gmail.com>, Chris Ball <cjb@laptop.org>
Subject: [PATCH V2 2/2] mmc: sdhci: disable MMC_CAP_NEEDS_POLL in
	nonremovable case
Date: Mon, 27 Sep 2010 09:42:20 +0100
Message-Id: <1285576940-27587-3-git-send-email-matt@console-pimps.org>
X-Mailer: git-send-email 1.7.2.2.162.g5cba1
In-Reply-To: <1285576940-27587-1-git-send-email-matt@console-pimps.org>
References: <1285576940-27587-1-git-send-email-matt@console-pimps.org>
Sender: linux-mmc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-mmc.vger.kernel.org>
X-Mailing-List: linux-mmc@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Mon, 27 Sep 2010 08:42:24 +0000 (UTC)


diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 5928b0a..d851315 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1847,7 +1847,8 @@ int sdhci_add_host(struct sdhci_host *host)
 	if (caps & SDHCI_CAN_DO_HISPD)
 		mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
 
-	if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)
+	if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) &&
+	    mmc_card_is_removable(mmc))
 		mmc->caps |= MMC_CAP_NEEDS_POLL;
 
 	mmc->ocr_avail = 0;