commit 62ba8ce1a9351cb6914852b08fb55ec0b37c65a2
author Linux Build Service Account <lnxbuild@localhost> Tue May 07 19:28:42 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue May 07 19:28:41 2013 -0700
tree c0dc470db49edb1fecfee955e76ddf4dbc70a10a
parent 0fa3a57988942c9bad42b79fd1bb5cc539f150ca
parent ce59f66031b62d82ef5f4561f26807d7a6eaf605

Merge "leds: leds-qpnp: Add masks for mode ctrl and source"

drivers/leds/leds-qpnp.c

diff --git a/drivers/leds/leds-qpnp.c b/drivers/leds/leds-qpnp.c
index 67ea917..d0962ca 100644
--- a/drivers/leds/leds-qpnp.c
+++ b/drivers/leds/leds-qpnp.c
@@ -171,6 +171,8 @@
 #define LED_MPP_SINK_MASK		0x07
 #define LED_MPP_MODE_MASK		0x7F
 #define LED_MPP_EN_MASK			0x80
+#define LED_MPP_SRC_MASK		0x0F
+#define LED_MPP_MODE_CTRL_MASK		0x70
 
 #define LED_MPP_MODE_SINK		(0x06 << 4)
 #define LED_MPP_MODE_ENABLE		0x01
@@ -551,7 +553,8 @@
 			return rc;
 		}
 
-		val = led->mpp_cfg->source_sel | led->mpp_cfg->mode_ctrl;
+		val = (led->mpp_cfg->source_sel & LED_MPP_SRC_MASK) |
+			(led->mpp_cfg->mode_ctrl & LED_MPP_MODE_CTRL_MASK);
 
 		rc = qpnp_led_masked_write(led,
 		LED_MPP_MODE_CTRL(led->base), LED_MPP_MODE_MASK,