diff --git a/[refs] b/[refs]
index 9e7b41b1347a..f7f53e140037 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6297b5e54b5511d4e72e8d5fc3b139650adc74d8
+refs/heads/master: bc909f27f55ceb8f950ced5cf3a26d6b26e86ca6
diff --git a/trunk/drivers/power/da9052-battery.c b/trunk/drivers/power/da9052-battery.c
index a5f6a0ec1572..20b86ed946e3 100644
--- a/trunk/drivers/power/da9052-battery.c
+++ b/trunk/drivers/power/da9052-battery.c
@@ -327,7 +327,7 @@ static int da9052_bat_interpolate(int vbat_lower, int  vbat_upper,
 	return tmp;
 }
 
-unsigned char da9052_determine_vc_tbl_index(unsigned char adc_temp)
+static unsigned char da9052_determine_vc_tbl_index(unsigned char adc_temp)
 {
 	int i;
 
@@ -345,6 +345,13 @@ unsigned char da9052_determine_vc_tbl_index(unsigned char adc_temp)
 		     && (adc_temp <= vc_tbl_ref[i]))
 				return i + 1;
 	}
+	/*
+	 * For some reason authors of the driver didn't presume that we can
+	 * end up here. It might be OK, but might be not, no one knows for
+	 * sure. Go check your battery, is it on fire?
+	 */
+	WARN_ON(1);
+	return 0;
 }
 
 static int da9052_bat_read_capacity(struct da9052_battery *bat, int *capacity)