From patchwork Fri Aug 27 06:34:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 177432 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Fri, 27 Aug 2010 07:34:59 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OosWh-0005a2-4f for chris@printf.net; Fri, 27 Aug 2010 07:34:59 +0100 Received: by mail.laptop.org (Postfix) id 4535E23B56; Fri, 27 Aug 2010 02:34:40 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 39F1F23B54 for ; Fri, 27 Aug 2010 02:34:40 -0400 (EDT) X-ASG-Debug-ID: 1282890897-0b7469940001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id 0H6CP4qcL4Ko3SIY for ; Fri, 27 Aug 2010 02:34:57 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751529Ab0H0Ge4 (ORCPT ); Fri, 27 Aug 2010 02:34:56 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:17001 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751034Ab0H0Ge4 (ORCPT ); Fri, 27 Aug 2010 02:34:56 -0400 Received: from epmmp2 (mailout3.samsung.com [203.254.224.33]) by mailout3.samsung.com (Sun Java(tm) System Messaging Server 7u3-15.01 64bit (built Feb 12 2010)) with ESMTP id <0L7S00B2DSY6N9A0@mailout3.samsung.com> for linux-mmc@vger.kernel.org; Fri, 27 Aug 2010 15:34:54 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net ([165.213.149.150]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0L7S00BTYSY6PS@mmp2.samsung.com> for linux-mmc@vger.kernel.org; Fri, 27 Aug 2010 15:34:54 +0900 (KST) Received: from [127.0.0.1] ([10.89.53.131]) by TNRNDGASPAPP1.tn.corp.samsungelectronics.net with Microsoft SMTPSVC(6.0.3790.4675); Fri, 27 Aug 2010 15:34:54 +0900 Date: Fri, 27 Aug 2010 15:34:54 +0900 From: Jaehoon Chung X-ASG-Orig-Subj: [PATCH] sdhci: disable MMC_CAP_NEEDS_POLL in nonremovable case Subject: [PATCH] sdhci: disable MMC_CAP_NEEDS_POLL in nonremovable case To: linux-mmc@vger.kernel.org Cc: Kyungmin Park , matt@console-pimps.org, Marek Szyprowski Message-id: <4C775C8E.7040903@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=EUC-KR Content-transfer-encoding: 7BIT User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; ko; rv:1.9.2.4) Gecko/20100608 Thunderbird/3.1 X-OriginalArrivalTime: 27 Aug 2010 06:34:54.0203 (UTC) FILETIME=[F596F4B0:01CB45B1] Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1282890897 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.39152 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 401527d..4bc5d3c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1826,8 +1826,9 @@ 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) - mmc->caps |= MMC_CAP_NEEDS_POLL; + if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) && + !(host->mmc->caps & MMC_CAP_NONREMOVABLE)) + mmc->caps |= MMC_CAP_NEEDS_POLL; mmc->ocr_avail = 0; if (caps & SDHCI_CAN_VDD_330)