From 81cf471d18319cc647b29e109add91887c5a934b Mon Sep 17 00:00:00 2001 From: Syam Sidhardhan Date: Mon, 25 Feb 2013 04:33:25 +0530 Subject: [PATCH] --- yaml --- r: 367497 b: refs/heads/master c: c6cc9fc9d42ec82da2c770f0bef1488dc467f29c h: refs/heads/master i: 367495: a56290212c7ea01d865ed2152d4920179c8f4b11 v: v3 --- [refs] | 2 +- trunk/drivers/power/s3c_adc_battery.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 634a3ef7570b..74f32dc560f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9239ebcffb9301eab75c638dcb702688884cc5d6 +refs/heads/master: c6cc9fc9d42ec82da2c770f0bef1488dc467f29c diff --git a/trunk/drivers/power/s3c_adc_battery.c b/trunk/drivers/power/s3c_adc_battery.c index d2ca989dcbdc..5948ce058bdd 100644 --- a/trunk/drivers/power/s3c_adc_battery.c +++ b/trunk/drivers/power/s3c_adc_battery.c @@ -145,14 +145,17 @@ static int s3c_adc_bat_get_property(struct power_supply *psy, int new_level; int full_volt; - const struct s3c_adc_bat_thresh *lut = bat->pdata->lut_noac; - unsigned int lut_size = bat->pdata->lut_noac_cnt; + const struct s3c_adc_bat_thresh *lut; + unsigned int lut_size; if (!bat) { dev_err(psy->dev, "no battery infos ?!\n"); return -EINVAL; } + lut = bat->pdata->lut_noac; + lut_size = bat->pdata->lut_noac_cnt; + if (bat->volt_value < 0 || bat->cur_value < 0 || jiffies_to_msecs(jiffies - bat->timestamp) > BAT_POLL_INTERVAL) {