From f23b966765053f2bcadcf461fc7a84b233e3ccd6 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 31 Oct 2011 14:24:30 +0800
Subject: [PATCH] --- yaml --- r: 276936 b: refs/heads/master c:
 26bc4e0cc5426e86398d6780d160f02c0a347087 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mfd/tps6586x.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a626f7f2af0a..2df9ed3b35f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af65e6cef488be0bd15932c8ce9801a47a183051
+refs/heads/master: 26bc4e0cc5426e86398d6780d160f02c0a347087
diff --git a/trunk/drivers/mfd/tps6586x.c b/trunk/drivers/mfd/tps6586x.c
index bba26d96c240..a5ddf31b60ca 100644
--- a/trunk/drivers/mfd/tps6586x.c
+++ b/trunk/drivers/mfd/tps6586x.c
@@ -197,7 +197,7 @@ int tps6586x_set_bits(struct device *dev, int reg, uint8_t bit_mask)
 	if (ret)
 		goto out;
 
-	if ((reg_val & bit_mask) == 0) {
+	if ((reg_val & bit_mask) != bit_mask) {
 		reg_val |= bit_mask;
 		ret = __tps6586x_write(to_i2c_client(dev), reg, reg_val);
 	}