Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / power / da9052-battery.c

diff --git a/drivers/power/da9052-battery.c b/drivers/power/da9052-battery.c
index a5f6a0ec15726b8e93180ea51b1a4facde4474a5..d9d034d7496f7c3adeaf4af5e0d72bf02f522a7d 100644 (file)
--- a/drivers/power/da9052-battery.c
+++ b/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)
@@ -616,7 +623,7 @@ static s32 __devinit da9052_bat_probe(struct platform_device *pdev)
        return 0;
 
 err:
-       for (; i >= 0; i--) {
+       while (--i >= 0) {
                irq = platform_get_irq_byname(pdev, da9052_bat_irqs[i]);
                free_irq(bat->da9052->irq_base + irq, bat);
        }