GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-18 05:04:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge series "regulator: da9121: bug fixes" from Adam Ward <Adam.Ward.opensource@diasemi.com>:

Browse source 
This patch fixes a couple of bugs in the DA9121 driver.
One in an uninialised string I forgot to remove when changing to of_parse_cb()
The other is an index for an optional DT property which overflows

Adam Ward (2):
  regulator: da9121: Remove uninitialised string variable
  regulator: da9121: Fix index used for DT property

 drivers/regulator/da9121-regulator.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--
1.9.1
This commit is contained in:
Mark Brown 2020-12-08 17:06:43 +00:00
commit 9d125387d9
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/regulator/da9121-regulator.c
View file

@ -381,7 +381,7 @@ static int da9121_of_parse_cb(struct device_node *np,
uint32_t ripple_reg; uint32_t ripple_reg;
int ret; int ret;
if (of_property_read_u32(da9121_matches[pdata->num_buck].of_node, if (of_property_read_u32(da9121_matches[pdata->num_buck-1].of_node,
"dlg,ripple-cancel", &ripple_cancel)) { "dlg,ripple-cancel", &ripple_cancel)) {
if (pdata->num_buck > 1) if (pdata->num_buck > 1)
ripple_reg = DA9xxx_REG_BUCK_BUCK2_7; ripple_reg = DA9xxx_REG_BUCK_BUCK2_7;
@ -816,7 +816,6 @@ static int da9121_check_device_type(struct i2c_client *i2c, struct da9121 *chip)
u32 variant_id; u32 variant_id;
u8 variant_mrc, variant_vrc; u8 variant_mrc, variant_vrc;
char *type; char *type;
const char *name;
bool config_match = false; bool config_match = false;
int ret = 0; int ret = 0;
@ -867,7 +866,7 @@ static int da9121_check_device_type(struct i2c_client *i2c, struct da9121 *chip)
device_id, variant_id, type); device_id, variant_id, type);
if (!config_match) { if (!config_match) {
dev_err(chip->dev, "Device tree configuration '%s' does not match detected device.\n", name); dev_err(chip->dev, "Device tree configuration does not match detected device.\n");
ret = -EINVAL; ret = -EINVAL;
goto error; goto error;
} }