diff --git a/[refs] b/[refs]
index 57258489e3e6..5e03b76d6e41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47f0ac2b0a8c7f26b513a2a18045219b030aedf1
+refs/heads/master: 44abd774f52999125d499aed17a2f70211c34dcd
diff --git a/trunk/drivers/power/max8997_charger.c b/trunk/drivers/power/max8997_charger.c
index e12b4a2a0be2..6e88c5d026b9 100644
--- a/trunk/drivers/power/max8997_charger.c
+++ b/trunk/drivers/power/max8997_charger.c
@@ -97,7 +97,7 @@ static __devinit int max8997_battery_probe(struct platform_device *pdev)
 		return -EINVAL;
 
 	if (pdata->eoc_mA) {
-		u8 val = (pdata->eoc_mA - 50) / 10;
+		int val = (pdata->eoc_mA - 50) / 10;
 		if (val < 0)
 			val = 0;
 		if (val > 0xf)