summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLesly A M <leslyam@ti.com>2011-04-14 17:57:49 +0530
committerSamuel Ortiz <sameo@linux.intel.com>2011-05-11 11:09:58 +0200
commitc62dd365e248222903e6e3e3a8f5d8587e7e3345 (patch)
tree658308228d3e24bcad5a7e4b60cc31d3e031293c
parenta09aee8b636a3b2b7b10ad57d60d91e9272e771d (diff)
downloadlinux-3.10-c62dd365e248222903e6e3e3a8f5d8587e7e3345.tar.gz
linux-3.10-c62dd365e248222903e6e3e3a8f5d8587e7e3345.tar.bz2
linux-3.10-c62dd365e248222903e6e3e3a8f5d8587e7e3345.zip
mfd: Fix for the TWL4030 PM sleep/wakeup sequence
Only configure sleep script when the flag is TWL4030_SLEEP_SCRIPT. Adding the missing brackets for fixing the issue. Signed-off-by: Lesly A M <leslyam@ti.com> Cc: Nishanth Menon <nm@ti.com> Cc: David Derrick <dderrick@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/twl4030-power.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 16422de0823..2c0d4d16491 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -447,12 +447,13 @@ static int __init load_twl4030_script(struct twl4030_script *tscript,
if (err)
goto out;
}
- if (tscript->flags & TWL4030_SLEEP_SCRIPT)
+ if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
if (order)
pr_warning("TWL4030: Bad order of scripts (sleep "\
"script before wakeup) Leads to boot"\
"failure on some boards\n");
err = twl4030_config_sleep_sequence(address);
+ }
out:
return err;
}