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

Merge "power: smb-lib: Rerun APSD regardless of charger-type"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-31 21:24:25 -07:00 • committed by Gerrit - the friendly Code Review server
commit eed551694d
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/power/supply/qcom/smb-lib.c
View file

@ -725,7 +725,6 @@ void smblib_suspend_on_debug_battery(struct smb_charger *chg)
int smblib_rerun_apsd_if_required(struct smb_charger *chg) int smblib_rerun_apsd_if_required(struct smb_charger *chg)
{ {
const struct apsd_result *apsd_result;
union power_supply_propval val; union power_supply_propval val;
int rc; int rc;
@ -738,12 +737,6 @@ int smblib_rerun_apsd_if_required(struct smb_charger *chg)
if (!val.intval) if (!val.intval)
return 0; return 0;
apsd_result = smblib_get_apsd_result(chg);
if ((apsd_result->pst != POWER_SUPPLY_TYPE_UNKNOWN)
&& (apsd_result->pst != POWER_SUPPLY_TYPE_USB))
/* if type is not usb or unknown no need to rerun apsd */
return 0;
/* fetch the DPDM regulator */ /* fetch the DPDM regulator */
if (!chg->dpdm_reg && of_get_property(chg->dev->of_node, if (!chg->dpdm_reg && of_get_property(chg->dev->of_node,
"dpdm-supply", NULL)) { "dpdm-supply", NULL)) {