mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Warren <swarren@nvidia.com>
To: <linux-kernel@vger.kernel.org>
Cc: <lrg@slimlogic.co.uk>, <broonie@opensource.wolfsonmicro.com>,
	<dahuang@nvidia.com>, <olofj@chromium.org>,
	Stephen Warren <swarren@nvidia.com>
Subject: [PATCH 1/4] regulator: tps6586x: Add missing bit mask generation
Date: Wed, 1 Dec 2010 13:37:28 -0700	[thread overview]
Message-ID: <1291235851-29523-2-git-send-email-swarren@nvidia.com> (raw)
In-Reply-To: <1291235851-29523-1-git-send-email-swarren@nvidia.com>

From: Danny Huang <dahuang@nvidia.com>

Change-Id: I76eaceb31b56264f6978af15db1e6fc7e2e01b5a
Signed-off-by: Danny Huang <dahuang@nvidia.com>
Signed-off-by: Olof Johansson <olofj@chromium.org>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
  (Split into separate patches)
---
 drivers/regulator/tps6586x-regulator.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index 51237fb..0e59e81 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -298,14 +298,14 @@ static inline int tps6586x_regulator_preinit(struct device *parent,
 	if (ret)
 		return ret;
 
-	if (!(val2 & ri->enable_bit[1]))
+	if (!(val2 & (1 << ri->enable_bit[1])))
 		return 0;
 
 	/*
 	 * The regulator is on, but it's enabled with the bit we don't
 	 * want to use, so we switch the enable bits
 	 */
-	if (!(val1 & ri->enable_bit[0])) {
+	if (!(val1 & (1 << ri->enable_bit[0]))) {
 		ret = tps6586x_set_bits(parent, ri->enable_reg[0],
 					1 << ri->enable_bit[0]);
 		if (ret)
-- 
1.7.0.4
nvpublic


  reply	other threads:[~2010-12-01 20:38 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-01 20:37 [PATCH 0/4] Various tps6586x regulator fixes from ChromeOS Stephen Warren
2010-12-01 20:37 ` Stephen Warren [this message]
2010-12-01 20:37 ` [PATCH 2/4] regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit Stephen Warren
2010-12-01 20:37 ` [PATCH 3/4] regulator: tps6586x: Handle both enable reg/bits being the same Stephen Warren
2010-12-01 20:37 ` [PATCH 4/4] regulator: tps6586x: correct register table Stephen Warren
2010-12-02  9:40 ` [PATCH 0/4] Various tps6586x regulator fixes from ChromeOS Mark Brown
2010-12-02 11:28   ` Liam Girdwood

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1291235851-29523-2-git-send-email-swarren@nvidia.com \
    --to=swarren@nvidia.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=dahuang@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@slimlogic.co.uk \
    --cc=olofj@chromium.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome