Linux 3.2.57

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

diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 2c0d4d1..a764676 100644 (file)
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -120,7 +120,7 @@ static u8 res_config_addrs[] = {
        [RES_HFCLKOUT]  = 0x8b,
        [RES_32KCLKOUT] = 0x8e,
        [RES_RESET]     = 0x91,
-       [RES_Main_Ref]  = 0x94,
+       [RES_MAIN_REF]  = 0x94,
 };
 
 static int __init twl4030_write_script_byte(u8 address, u8 byte)
@@ -448,7 +448,7 @@ static int __init load_twl4030_script(struct twl4030_script *tscript,
                        goto out;
        }
        if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
-               if (order)
+               if (!order)
                        pr_warning("TWL4030: Bad order of scripts (sleep "\
                                        "script before wakeup) Leads to boot"\
                                        "failure on some boards\n");
@@ -485,9 +485,9 @@ int twl4030_remove_script(u8 flags)
                        return err;
        }
        if (flags & TWL4030_WAKEUP12_SCRIPT) {
-               if (err)
                err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
                                R_SEQ_ADD_S2A12);
+               if (err)
                        return err;
        }
        if (flags & TWL4030_WAKEUP3_SCRIPT) {