A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix bq25997x power supply access issue

Browse source 
After bq25997x is removed, mmi_pl_charger driver will still
access bq25997x power supply pointer, which will cause panic.

To avoid this situation, get the power supply before use it
at any time.

Change-Id: Ia1672fc458dce3c86647b8e31c57ac283b910fa2
Signed-off-by: yanyh2 <yanyh2@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1247691
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Jianqi Yang <yangj@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
yanyh2 2018-09-27 20:11:31 +08:00 • committed by Yonghua Yan
commit fe2395f620
1 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

43
drivers/power/mmi_pl_chg_manager/mmi_pl_chg_manager.c
View file

@ -367,11 +367,9 @@ static void mmi_update_flashc_status(struct mmi_pl_chg_manager *chip)
int rc;
union power_supply_propval prop = {0,};
if (!chip->flashc_psy) {
chip->flashc_psy = power_supply_get_by_name(chip->flashc_name);
if (!chip->flashc_psy)
return;
}
chip->flashc_psy = power_supply_get_by_name(chip->flashc_name);
if (!chip->flashc_psy)
return;
rc = power_supply_get_property(chip->flashc_psy,
POWER_SUPPLY_PROP_VOLTAGE_NOW, &prop);
@ -437,6 +435,7 @@ static void mmi_update_flashc_status(struct mmi_pl_chg_manager *chip)
chip->flashc_handle.die_therm_fault =
!!(prop.intval & DIE_THERM_FAULT_MASK);
}
power_supply_put(chip->flashc_psy);
mmi_pl_dbg(chip, PR_MOTO, "flash charger IC : ---- status update ---\n");
mmi_pl_dbg(chip, PR_MOTO, "vbat_volt %d \n",
@ -499,19 +498,19 @@ static int mmi_pl_pm_flashc_enable(struct mmi_pl_chg_manager *chip, bool enable)
int rc;
union power_supply_propval prop = {0,};
if (!chip->flashc_psy) {
chip->flashc_psy = power_supply_get_by_name(chip->flashc_name);
if (!chip->flashc_psy)
return -ENODEV;
}
chip->flashc_psy = power_supply_get_by_name(chip->flashc_name);
if (!chip->flashc_psy)
return -ENODEV;
prop.intval = enable;
rc = power_supply_set_property(chip->flashc_psy,
POWER_SUPPLY_PROP_CHARGING_ENABLED, &prop);
if (rc < 0) {
mmi_pl_err(chip, "Couldn't disable flashc charging, rc=%d\n", rc);
power_supply_put(chip->flashc_psy);
return rc;
}
power_supply_put(chip->flashc_psy);
return rc;
}
@ -521,12 +520,10 @@ static int mmi_pl_pm_check_flashc_enable(struct mmi_pl_chg_manager *chip)
int rc;
union power_supply_propval prop = {0,};
chip->flashc_psy = power_supply_get_by_name(chip->flashc_name);
if (!chip->flashc_psy) {
chip->flashc_psy = power_supply_get_by_name(chip->flashc_name);
if (!chip->flashc_psy) {
chip->flashc_handle.charge_enabled = false;
return -ENODEV;
}
chip->flashc_handle.charge_enabled = false;
return -ENODEV;
}
rc = power_supply_get_property(chip->flashc_psy,
@ -536,6 +533,8 @@ static int mmi_pl_pm_check_flashc_enable(struct mmi_pl_chg_manager *chip)
} else
chip->flashc_handle.charge_enabled = false;
power_supply_put(chip->flashc_psy);
return rc;
}
@ -2051,16 +2050,18 @@ static ssize_t flashc_vbat_show(struct device *dev,
union power_supply_propval prop = {0,};
struct mmi_pl_chg_manager *chip = dev_get_drvdata(dev);
if (!chip->flashc_psy) {
chip->flashc_psy = power_supply_get_by_name(chip->flashc_name);
if (!chip->flashc_psy)
return rc;
}
chip->flashc_psy = power_supply_get_by_name(chip->flashc_name);
if (!chip->flashc_psy)
return rc;
rc = power_supply_get_property(chip->flashc_psy,
POWER_SUPPLY_PROP_VOLTAGE_NOW, &prop);
if (rc)
if (rc) {
power_supply_put(chip->flashc_psy);
return rc;
}
power_supply_put(chip->flashc_psy);
return scnprintf(buf, FLASHC_SHOW_MAX_SIZE, "%d\n", prop.intval*1000);
}