Merge series "regulator: da9121: bug fixes" from Adam Ward <Adam.Ward.opensource...

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

diff --git a/drivers/regulator/da9121-regulator.c b/drivers/regulator/da9121-regulator.c
index 9d5b02fb16579cd4497acbc54cecc9ee66fc58b8..a2ede7d7897eb1a5059ae1978cc45c2e84f119ed 100644 (file)
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -914,6 +914,7 @@ static int da9121_assign_chip_model(struct i2c_client *i2c,
                ret = PTR_ERR(chip->regmap);
                dev_err(chip->dev, "Failed to configure a register map: %d\n",
                        ret);
+               return ret;
        }
 
        ret = da9121_check_device_type(i2c, chip);