From patchwork Wed Sep 15 20:38:55 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Chris Ball <cjb@laptop.org>
X-Patchwork-Id: 183372
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 o8FKeZhv027939
	for <patchwork-linux-mmc@patchwork.kernel.org>;
	Wed, 15 Sep 2010 20:40:36 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753697Ab0IOUi7 (ORCPT
	<rfc822;patchwork-linux-mmc@patchwork.kernel.org>);
	Wed, 15 Sep 2010 16:38:59 -0400
Received: from void.printf.net ([89.145.121.20]:38948 "EHLO void.printf.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753682Ab0IOUi7 (ORCPT <rfc822;linux-mmc@vger.kernel.org>);
	Wed, 15 Sep 2010 16:38:59 -0400
Received: from chris by void.printf.net with local (Exim 4.69)
	(envelope-from <chris@void.printf.net>)
	id 1Ovykp-00022e-Ov; Wed, 15 Sep 2010 21:38:55 +0100
Date: Wed, 15 Sep 2010 21:38:55 +0100
From: Chris Ball <cjb@laptop.org>
To: Matt Fleming <matt@console-pimps.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 Dooks <ben-linux@fluff.org>, Ben Hutchings <ben@decadent.org.uk>,
	Yunpeng Gao <yunpeng.gao@intel.com>
Subject: Re: [PATCH 2/2] sdhci: disable MMC_CAP_NEEDS_POLL in nonremovable
	case
Message-ID: <20100915203855.GA6620@void.printf.net>
References: 
 <4d1a88f196fa7e7eaf4c4a4af13d91ec81fb084e.1283003070.git.matt@console-pimps.org>
	<7e892c443f11d51a30029ddfeef27af09a9a970d.1283003070.git.matt@console-pimps.org>
	<4C7F65A1.60105@samsung.com>
	<20100902091424.GA12456@console-pimps.org>
	<4C86E672.1030807@samsung.com>
	<20100915151142.GB21538@console-pimps.org>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20100915151142.GB21538@console-pimps.org>
User-Agent: Mutt/1.5.18 (2008-05-17)
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]);
	Wed, 15 Sep 2010 20:40:36 +0000 (UTC)


diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index ac8b12b..fb6b170 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1846,7 +1846,8 @@ int sdhci_add_host(struct sdhci_host *host)
 	if (caps & SDHCI_CAN_DO_HISPD)
 		mmc->caps |= MMC_CAP_SD_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;