Merge remote-tracking branch 'regulator/topic/da9063' into regulator-next

diff --combined drivers/regulator/da9063-regulator.c
index b9f2653e4ef90f315de25752fe24821a98497848,362261359ce8c1ee19140c12022be2d8d0174138..3d910f4f3a0e855f95dc336500edb74af1176d99
--- 1/drivers/regulator/da9063-regulator.c
--- 2/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@@ -709,7 -709,7 +709,7 @@@ static struct da9063_regulators_pdata *
                struct of_regulator_match **da9063_reg_matches)
  {
        da9063_reg_matches = NULL;
 -      return PTR_ERR(-ENODEV);
 +      return ERR_PTR(-ENODEV);
  }
  #endif
  
@@@ -717,7 -717,7 +717,7 @@@ static int da9063_regulator_probe(struc
  {
        struct da9063 *da9063 = dev_get_drvdata(pdev->dev.parent);
        struct da9063_pdata *da9063_pdata = dev_get_platdata(da9063->dev);
-       struct of_regulator_match *da9063_reg_matches;
+       struct of_regulator_match *da9063_reg_matches = NULL;
        struct da9063_regulators_pdata *regl_pdata;
        const struct da9063_dev_model *model;
        struct da9063_regulators *regulators;