evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "qpnp-qnovo: fix ptrain done handler"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-25 15:30:49 -07:00 • committed by Gerrit - the friendly Code Review server
commit cac55e7f09
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/power/supply/qcom/qpnp-qnovo.c
View file

@ -1423,16 +1423,7 @@ static irqreturn_t handle_ptrain_done(int irq, void *data)
struct qnovo *chip = data; struct qnovo *chip = data;
union power_supply_propval pval = {0}; union power_supply_propval pval = {0};
/* qnovo_update_status(chip);
* In some cases (esp shutting down) the userspace would disable by
* setting qnovo_enable=0. Also charger could be removed or there is
* an error (i.e. its not okay to run qnovo)-
* skip taking ESR measurement in such situations
*/
if (get_client_vote(chip->disable_votable, USER_VOTER)
|| get_effective_result(chip->not_ok_to_qnovo_votable) > 0)
return IRQ_HANDLED;
/* /*
* hw resets pt_en bit once ptrain_done triggers. * hw resets pt_en bit once ptrain_done triggers.
@ -1443,13 +1434,14 @@ static irqreturn_t handle_ptrain_done(int irq, void *data)
vote(chip->pt_dis_votable, QNI_PT_VOTER, true, 0); vote(chip->pt_dis_votable, QNI_PT_VOTER, true, 0);
vote(chip->pt_dis_votable, ESR_VOTER, true, 0); vote(chip->pt_dis_votable, ESR_VOTER, true, 0);
if (is_fg_available(chip)) if (is_fg_available(chip)
&& !get_client_vote(chip->disable_votable, USER_VOTER)
&& !get_effective_result(chip->not_ok_to_qnovo_votable))
power_supply_set_property(chip->bms_psy, power_supply_set_property(chip->bms_psy,
POWER_SUPPLY_PROP_RESISTANCE, POWER_SUPPLY_PROP_RESISTANCE,
&pval); &pval);
vote(chip->pt_dis_votable, ESR_VOTER, false, 0); vote(chip->pt_dis_votable, ESR_VOTER, false, 0);
qnovo_update_status(chip);
kobject_uevent(&chip->dev->kobj, KOBJ_CHANGE); kobject_uevent(&chip->dev->kobj, KOBJ_CHANGE);
return IRQ_HANDLED; return IRQ_HANDLED;
} }