From cfa515a4e9552e271e2f619a835fce74b5f5ea23 Mon Sep 17 00:00:00 2001 From: Rupesh Kumar Date: Wed, 22 Aug 2012 15:14:22 +0530 Subject: [PATCH] --- yaml --- r: 367473 b: refs/heads/master c: 2c4c40ac0052eaf9b14009635ab475362e88c6e0 h: refs/heads/master i: 367471: a0e2535835d4d6032ede0f78473cfb4723e10403 v: v3 --- [refs] | 2 +- trunk/drivers/power/ab8500_btemp.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e93feac80b65..f4b512fd0d6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db43e6c473b57d4e7a55c4bd6edef71f40f13eae +refs/heads/master: 2c4c40ac0052eaf9b14009635ab475362e88c6e0 diff --git a/trunk/drivers/power/ab8500_btemp.c b/trunk/drivers/power/ab8500_btemp.c index fa60e3ac33a3..91ad3edf6197 100644 --- a/trunk/drivers/power/ab8500_btemp.c +++ b/trunk/drivers/power/ab8500_btemp.c @@ -609,7 +609,6 @@ static void ab8500_btemp_periodic_work(struct work_struct *work) struct ab8500_btemp, btemp_periodic_work.work); if (!di->initialized) { - di->initialized = true; /* Identify the battery */ if (ab8500_btemp_id(di) < 0) dev_warn(di->dev, "failed to identify the battery\n"); @@ -622,8 +621,9 @@ static void ab8500_btemp_periodic_work(struct work_struct *work) * same temperature. Else only allow 1 degree change from previous * reported value in the direction of the new measurement. */ - if (bat_temp == di->prev_bat_temp || !di->initialized) { - if (di->bat_temp != di->prev_bat_temp || !di->initialized) { + if ((bat_temp == di->prev_bat_temp) || !di->initialized) { + if ((di->bat_temp != di->prev_bat_temp) || !di->initialized) { + di->initialized = true; di->bat_temp = bat_temp; power_supply_changed(&di->btemp_psy); }