diff --git a/[refs] b/[refs]
index e3d30ad4c077..12a336ab46c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90a38d999739f35f4fc925c875e6ee518546b66c
+refs/heads/master: a32415202f709f39a059f776da28248c499e0bb5
diff --git a/trunk/drivers/mfd/twl6040-core.c b/trunk/drivers/mfd/twl6040-core.c
index 3f2a1cf02fc0..b220aa241911 100644
--- a/trunk/drivers/mfd/twl6040-core.c
+++ b/trunk/drivers/mfd/twl6040-core.c
@@ -258,7 +258,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
 			ret = twl6040_power_up_completion(twl6040, naudint);
 			if (ret) {
 				dev_err(twl6040->dev,
-					"automatic power-down failed\n");
+					"automatic power-up failed\n");
 				twl6040->power_count = 0;
 				goto out;
 			}