From 8042a207c83b543bfd166c8824e1b63cc57d00f9 Mon Sep 17 00:00:00 2001 From: Bernie Moreno-BERNIEM Date: Wed, 13 Oct 2021 20:54:52 -0500 Subject: [PATCH] power:fet_control: ironmn: Fix typo in chrg-fullcurr-en-gpio Fix errant 1 placed in chrg_fullcurr_en_gpio assignment from parse_dt. Should be a 0 param instead. Also check battplus_state at beginning and terminate work is already set. Change-Id: Ia69bfa919452e03423d669afd633fd9af3599966 Signed-off-by: Bernie Moreno-BERNIEM Reviewed-on: https://gerrit.mot.com/2089379 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Ling Jin Submit-Approved: Jira Key --- drivers/power/fet-control/fet_control.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/power/fet-control/fet_control.c b/drivers/power/fet-control/fet_control.c index f25007c7cbd3..3849b8c44afb 100755 --- a/drivers/power/fet-control/fet_control.c +++ b/drivers/power/fet-control/fet_control.c @@ -223,6 +223,11 @@ static void update_work(struct work_struct *work) int hb_sched_time = HBDLY_DISCHARGE_MS; fullcurr_state = CHRG_FULLCURR_EN; + if (battplus_state) { + pr_info("BATTFET Closed- Ending Work..\n"); + cancel_delayed_work(&data->update); + return; + } /*flip_mv = get_ps_int_prop(data->flip_batt_psy, POWER_SUPPLY_PROP_VOLTAGE_NOW); @@ -306,7 +311,7 @@ static int parse_dt(struct device_node *node) } fetControlData.chrg_fullcurr_en_gpio = of_get_named_gpio(node, - "mmi,chrg-fullcurr-en-gpio", 1); + "mmi,chrg-fullcurr-en-gpio", 0); if (!gpio_is_valid(fetControlData.chrg_fullcurr_en_gpio)) { pr_err("chrg-fullcurr-en-gpio is not valid!\n"); return -ENODEV;