From ae4ceb076655a7b2e465dffd63b400083b32e33f Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Wed, 22 Aug 2012 19:29:44 -0700 Subject: [PATCH] --- yaml --- r: 330479 b: refs/heads/master c: bc909f27f55ceb8f950ced5cf3a26d6b26e86ca6 h: refs/heads/master i: 330477: ed4c6b38132994d5305c8a8da0b1b40922e912dd 330475: 85f0639cb3a7cccbb8ee19960516e046a2648e1a 330471: 310a1568f57d8520a6ecfe6c2a67be2549905cab 330463: 48926224611dbfc57856ef976e2b39f7a74b3a37 v: v3 --- [refs] | 2 +- trunk/drivers/power/da9052-battery.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) 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)