Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 367497
b: refs/heads/master
c: c6cc9fc
h: refs/heads/master
i:
  367495: a562902
v: v3
  • Loading branch information
Syam Sidhardhan authored and Anton Vorontsov committed Mar 19, 2013
1 parent f9e6b30 commit 81cf471
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9239ebcffb9301eab75c638dcb702688884cc5d6
refs/heads/master: c6cc9fc9d42ec82da2c770f0bef1488dc467f29c
7 changes: 5 additions & 2 deletions trunk/drivers/power/s3c_adc_battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 81cf471

Please sign in to comment.