projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2955c30)
mfd: Program twl4030 remap_sleep correctly
authorMike Turquette <mturquette@ti.com>
Fri, 5 Feb 2010 08:51:37 +0000 (09:51 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Sun, 7 Mar 2010 21:17:14 +0000 (22:17 +0100)
Variable remap was incorrectly referencing remap_off for the remap_sleep
case when configuring TWL4030 power scripts.

Signed-off-by: Mike Turquette <mturquette@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/twl4030-power.c patch | blob | blame | history

diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 0815292fdafc6c98147b6f0328ed1f98f3861b2d..5b045ff4a2c2abea80fb41d8e17b0f1fdbb46110 100644 (file)
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -405,7 +405,7 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 
        if (rconfig->remap_sleep != TWL4030_RESCONFIG_UNDEF) {
                remap &= ~SLEEP_STATE_MASK;
-               remap |= rconfig->remap_off << SLEEP_STATE_SHIFT;
+               remap |= rconfig->remap_sleep << SLEEP_STATE_SHIFT;
        }
 
        err = twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,