| Message ID | 1304687833-4578-2-git-send-email-leslyam@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Lesly A M <leslyam@ti.com> writes: > 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> > Cc: Samuel Ortiz <sameo@linux.intel.com> Acked-by: Kevin Hilman <khilman@ti.com> > --- > drivers/mfd/twl4030-power.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c > index 6fed964..97f54ce 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; > } -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Lesly, On Fri, May 06, 2011 at 06:47:07PM +0530, Lesly A M wrote: > Only configure sleep script when the flag is TWL4030_SLEEP_SCRIPT. > > Adding the missing brackets for fixing the issue. This is already upstream. Cheers, Samuel.
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c index 6fed964..97f54ce 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; }
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> Cc: Samuel Ortiz <sameo@linux.intel.com> --- drivers/mfd/twl4030-power.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)