From 1c0dccf7ddab732a271b5a8e690ff19f49ba0fcb Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Wed, 9 May 2012 07:40:39 +1000
Subject: [PATCH] --- yaml --- r: 320489 b: refs/heads/master c:
 9c645d2f887bd92df487b2c5dcd44d5fc0e7c761 h: refs/heads/master i:   320487:
 9b660b4922395e798a56819d60e3453dc2dafe76 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/power/twl4030_charger.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5062bfe6854f..5d3f7eb7bada 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fc55bc8225d5a5c13b978e3e3dbf51e6cd6a333
+refs/heads/master: 9c645d2f887bd92df487b2c5dcd44d5fc0e7c761
diff --git a/trunk/drivers/power/twl4030_charger.c b/trunk/drivers/power/twl4030_charger.c
index fdad850c77d3..3e6e99101106 100644
--- a/trunk/drivers/power/twl4030_charger.c
+++ b/trunk/drivers/power/twl4030_charger.c
@@ -103,7 +103,7 @@ static int twl4030_bci_read(u8 reg, u8 *val)
 
 static int twl4030_clear_set_boot_bci(u8 clear, u8 set)
 {
-	return twl4030_clear_set(TWL4030_MODULE_PM_MASTER, 0,
+	return twl4030_clear_set(TWL4030_MODULE_PM_MASTER, clear,
 			TWL4030_CONFIG_DONE | TWL4030_BCIAUTOWEN | set,
 			TWL4030_PM_MASTER_BOOT_BCI);
 }
@@ -151,14 +151,14 @@ static int twl4030_bci_have_vbus(struct twl4030_bci *bci)
 }
 
 /*
- * Enable/Disable USB Charge funtionality.
+ * Enable/Disable USB Charge functionality.
  */
 static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable)
 {
 	int ret;
 
 	if (enable) {
-		/* Check for USB charger conneted */
+		/* Check for USB charger connected */
 		if (!twl4030_bci_have_vbus(bci))
 			return -ENODEV;