From cb15789fca13aa3bbbd792b31de0a67c2803a81b Mon Sep 17 00:00:00 2001 From: Mike Turquette Date: Fri, 5 Feb 2010 09:51:37 +0100 Subject: [PATCH] --- yaml --- r: 186903 b: refs/heads/master c: 1ea933f4cdbb88197139b9e62778beba0120e229 h: refs/heads/master i: 186901: a6fffb89f3559d4bd5b06443844bb1b17d273630 186899: 80ea81cdf111366544d9d05f317a595d2ab8c3d4 186895: e06c0411045a936f5e5dd395c05258e67b082aac v: v3 --- [refs] | 2 +- trunk/drivers/mfd/twl4030-power.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 344bb523fa9f..433980b7b153 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2955c309921e23d592ef585cf8e7ded1e11565b7 +refs/heads/master: 1ea933f4cdbb88197139b9e62778beba0120e229 diff --git a/trunk/drivers/mfd/twl4030-power.c b/trunk/drivers/mfd/twl4030-power.c index 0815292fdafc..5b045ff4a2c2 100644 --- a/trunk/drivers/mfd/twl4030-power.c +++ b/trunk/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,