michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: regulator: fix pmic regulator disable function

Browse source 
PMIC regulator disable function was unconditionally disabling the PMIC
regulator when the disable API was called, which does not match the
expected behavior when using the onoff service. Fix this error.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
This commit is contained in:
Daniel DeGrasse 2022-09-26 15:03:38 -05:00 • committed by Mahesh Mahadevan
commit 635506ec27
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/regulator/regulator_pmic.c
View file

@ -351,7 +351,7 @@ static int enable_regulator(const struct device *dev, struct onoff_client *cli)
en_val = config->enable_inverted ? 0 : config->enable_val;
rc = regulator_modify_register(dev, config->enable_reg,
config->enable_mask, en_val);
if (rc) {
if (rc != 0) {
return onoff_sync_finalize(&data->srv, key, NULL, rc, false);
}
return onoff_sync_finalize(&data->srv, key, cli, rc, true);
@ -370,15 +370,13 @@ static int disable_regulator(const struct device *dev)
if (rc == 0) {
rc = -EINVAL;
return onoff_sync_finalize(&data->srv, key, NULL, rc, false);
} else if (rc == 1) {
/* Disable regulator */
dis_val = config->enable_inverted ? config->enable_val : 0;
rc = regulator_modify_register(dev, config->enable_reg,
config->enable_mask, dis_val);
}
dis_val = config->enable_inverted ? config->enable_val : 0;
rc = regulator_modify_register(dev, config->enable_reg,
config->enable_mask, dis_val);
if (rc) {
/* Error writing configs */
return onoff_sync_finalize(&data->srv, key, NULL, rc, true);
}
return onoff_sync_finalize(&data->srv, key, NULL, rc, true);
return onoff_sync_finalize(&data->srv, key, NULL, rc, false);
}
static int pmic_reg_init(const struct device *dev)