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

Merge "power: qcom-step-chg: Fix the error return path"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-24 06:13:56 -07:00 • committed by Gerrit - the friendly Code Review server
commit ec1199f077
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/power/supply/qcom/step-chg-jeita.c
View file

@ -443,21 +443,24 @@ int qcom_step_chg_init(bool step_chg_enable, bool sw_jeita_enable)
!step_chg_config.prop_name)) { !step_chg_config.prop_name)) {
/* fail if step-chg configuration is invalid */ /* fail if step-chg configuration is invalid */
pr_err("Step-chg configuration not defined - fail\n"); pr_err("Step-chg configuration not defined - fail\n");
return -ENODATA; rc = -ENODATA;
goto release_wakeup_source;
} }
if (sw_jeita_enable && (!jeita_fcc_config.psy_prop || if (sw_jeita_enable && (!jeita_fcc_config.psy_prop ||
!jeita_fcc_config.prop_name)) { !jeita_fcc_config.prop_name)) {
/* fail if step-chg configuration is invalid */ /* fail if step-chg configuration is invalid */
pr_err("Jeita TEMP configuration not defined - fail\n"); pr_err("Jeita TEMP configuration not defined - fail\n");
return -ENODATA; rc = -ENODATA;
goto release_wakeup_source;
} }
if (sw_jeita_enable && (!jeita_fv_config.psy_prop || if (sw_jeita_enable && (!jeita_fv_config.psy_prop ||
!jeita_fv_config.prop_name)) { !jeita_fv_config.prop_name)) {
/* fail if step-chg configuration is invalid */ /* fail if step-chg configuration is invalid */
pr_err("Jeita TEMP configuration not defined - fail\n"); pr_err("Jeita TEMP configuration not defined - fail\n");
return -ENODATA; rc = -ENODATA;
goto release_wakeup_source;
} }
INIT_DELAYED_WORK(&chip->status_change_work, status_change_work); INIT_DELAYED_WORK(&chip->status_change_work, status_change_work);