From patchwork Thu Aug 5 21:32:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 176382 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: Thu, 05 Aug 2010 22:33:47 +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 1Oh84R-0004av-DJ for chris@printf.net; Thu, 05 Aug 2010 22:33:47 +0100 Received: by mail.laptop.org (Postfix) id 87BF523A5A; Thu, 5 Aug 2010 17:33:29 -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 DF43323A5D for ; Thu, 5 Aug 2010 17:33:26 -0400 (EDT) X-ASG-Debug-ID: 1281044013-745702370001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id 8EW6eHrNDm2Ndid0 for ; Thu, 05 Aug 2010 17:33:33 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756623Ab0HEVdc (ORCPT ); Thu, 5 Aug 2010 17:33:32 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:35255 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754603Ab0HEVdc (ORCPT ); Thu, 5 Aug 2010 17:33:32 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o75LWmkb026970 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 5 Aug 2010 14:32:49 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o75LWlge006062; Thu, 5 Aug 2010 14:32:47 -0700 Message-Id: <201008052132.o75LWlge006062@imap1.linux-foundation.org> X-ASG-Orig-Subj: + mmc-use-regulator-framework-correctly.patch added to -mm tree Subject: + mmc-use-regulator-framework-correctly.patch added to -mm tree To: mm-commits@vger.kernel.org Cc: adrian.hunter@nokia.com, broonie@opensource.wolfsonmicro.com, linux-mmc@vger.kernel.org, lrg@slimlogic.co.uk, sameo@linux.intel.com From: akpm@linux-foundation.org Date: Thu, 05 Aug 2010 14:32:47 -0700 X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 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: 1281044013 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=NO_REAL_NAME X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.37139 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 NO_REAL_NAME From: does not include a real name diff -puN drivers/mmc/core/core.c~mmc-use-regulator-framework-correctly drivers/mmc/core/core.c --- a/drivers/mmc/core/core.c~mmc-use-regulator-framework-correctly +++ a/drivers/mmc/core/core.c @@ -784,11 +784,6 @@ int mmc_regulator_set_ocr(struct regulat { int result = 0; int min_uV, max_uV; - int enabled; - - enabled = regulator_is_enabled(supply); - if (enabled < 0) - return enabled; if (vdd_bit) { int tmp; @@ -819,9 +814,9 @@ int mmc_regulator_set_ocr(struct regulat else result = 0; - if (result == 0 && !enabled) + if (result == 0) result = regulator_enable(supply); - } else if (enabled) { + } else { result = regulator_disable(supply); }