From patchwork Wed Oct 17 11:04:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Liu X-Patchwork-Id: 1604791 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 3606CDFABE for ; Wed, 17 Oct 2012 11:05:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756180Ab2JQLFK (ORCPT ); Wed, 17 Oct 2012 07:05:10 -0400 Received: from na3sys009aog103.obsmtp.com ([74.125.149.71]:48835 "EHLO na3sys009aog103.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756255Ab2JQLFJ (ORCPT ); Wed, 17 Oct 2012 07:05:09 -0400 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob103.postini.com ([74.125.148.12]) with SMTP ID DSNKUH6Q4HvsFTjLk/x+ECyDx1JidGZlI94E@postini.com; Wed, 17 Oct 2012 04:05:09 PDT Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 17 Oct 2012 04:04:55 -0700 Received: from localhost.localdomain (unknown [10.38.36.240]) by maili.marvell.com (Postfix) with ESMTP id 8B2174E510; Wed, 17 Oct 2012 04:04:53 -0700 (PDT) From: Kevin Liu To: linux-mmc@vger.kernel.org, cjb@laptop.org, pierre@ossman.eu, ulf.hansson@linaro.org, zgao6@marvell.com Cc: hzhuang1@marvell.com, cxie4@marvell.com, prakity@marvell.com, kliu5@marvell.com Subject: [PATCH v6 02/14] mmc: sdhci: refine voltage support caps setting Date: Wed, 17 Oct 2012 19:04:41 +0800 Message-Id: <1350471893-29633-3-git-send-email-keyuan.liu@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1350471893-29633-1-git-send-email-keyuan.liu@gmail.com> References: <1350471893-29633-1-git-send-email-keyuan.liu@gmail.com> X-OriginalArrivalTime: 17 Oct 2012 11:04:55.0061 (UTC) FILETIME=[3D163450:01CDAC57] Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Kevin Liu No need to disable the voltage support caps if it was NOT supported originally Signed-off-by: Kevin Liu --- drivers/mmc/host/sdhci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index dc493ba..94dab9c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2920,15 +2920,15 @@ int sdhci_add_host(struct sdhci_host *host) if (host->vmmc) { ret = regulator_is_supported_voltage(host->vmmc, 3300000, 3300000); - if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_330))) + if ((ret <= 0) && (caps[0] & SDHCI_CAN_VDD_330)) caps[0] &= ~SDHCI_CAN_VDD_330; ret = regulator_is_supported_voltage(host->vmmc, 3000000, 3000000); - if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_300))) + if ((ret <= 0) && (caps[0] & SDHCI_CAN_VDD_300)) caps[0] &= ~SDHCI_CAN_VDD_300; ret = regulator_is_supported_voltage(host->vmmc, 1800000, 1800000); - if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_180))) + if ((ret <= 0) && (caps[0] & SDHCI_CAN_VDD_180)) caps[0] &= ~SDHCI_CAN_VDD_180; } #endif /* CONFIG_REGULATOR */