diff options
| author | Mike Turquette <mturquette@ti.com> | 2010-02-05 03:51:37 -0500 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-03-07 16:17:14 -0500 |
| commit | 1ea933f4cdbb88197139b9e62778beba0120e229 (patch) | |
| tree | 0e6c149ae3e719c870ce271530049c7497cd636e /drivers/mfd | |
| parent | 2955c309921e23d592ef585cf8e7ded1e11565b7 (diff) | |
mfd: Program twl4030 remap_sleep correctly
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>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl4030-power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c index 0815292fdafc..5b045ff4a2c2 100644 --- 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) | |||
| 405 | 405 | ||
| 406 | if (rconfig->remap_sleep != TWL4030_RESCONFIG_UNDEF) { | 406 | if (rconfig->remap_sleep != TWL4030_RESCONFIG_UNDEF) { |
| 407 | remap &= ~SLEEP_STATE_MASK; | 407 | remap &= ~SLEEP_STATE_MASK; |
| 408 | remap |= rconfig->remap_off << SLEEP_STATE_SHIFT; | 408 | remap |= rconfig->remap_sleep << SLEEP_STATE_SHIFT; |
| 409 | } | 409 | } |
| 410 | 410 | ||
| 411 | err = twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, | 411 | err = twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, |