Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / mfd / twl4030-power.c

diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index d905f51..280c360 100644 (file)
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -441,12 +441,12 @@ static int __init load_twl4030_script(struct twl4030_script *tscript,
                err = twl4030_config_wakeup12_sequence(address);
                if (err)
                        goto out;
-               order = 1;
        }
        if (tscript->flags & TWL4030_WAKEUP3_SCRIPT) {
                err = twl4030_config_wakeup3_sequence(address);
                if (err)
                        goto out;
+               order = 1;
        }
        if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
                if (!order)