From 5dd6f5b15afe2b85fa47c2b0bd67f0183c4b97bb Mon Sep 17 00:00:00 2001 From: mahj8 Date: Fri, 19 Nov 2021 17:00:00 +0800 Subject: [PATCH] charging: fixed uevent block issue cat sys/class/power_supply/battery/uevent and return null, so UI can't show turbopower label. The power supply val->intval can't equal to -EINVAL. Change-Id: Ibd6a40770144185b11c54e8f21741fc06477686c Signed-off-by: mahj8 Reviewed-on: https://gerrit.mot.com/2121820 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- .../mmi_discrete_charger_core.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c b/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c index e51f5e9d74dd..312a09536981 100644 --- a/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c +++ b/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c @@ -1063,12 +1063,15 @@ static int batt_get_prop(struct power_supply *psy, break; default: mmi_err(chip, "Get not support prop %d rc = %d\n", psp, rc); - /* soft fail so uevents are not blocked */ - rc = 0; - val->intval = -EINVAL; + rc = -EINVAL; break; } + if (rc < 0) { + pr_debug("Couldn't get prop %d rc = %d\n", psp, rc); + return -ENODATA; + } + return rc; } @@ -1096,11 +1099,11 @@ static int batt_set_prop(struct power_supply *psy, vote(chip->fcc_votable, USER_VOTER, true, val->intval); break; default: - mmi_dbg(chip, "Get not support prop %d rc = %d\n", prop, rc); - /* soft fail so uevents are not blocked */ - rc = 0; + mmi_dbg(chip, "Set not support prop %d rc = %d\n", prop, rc); + rc = -EINVAL; break; } + return rc; }