Merge remote-tracking branch 'regulator/topic/ti-abb' into regulator-next

diff --cc drivers/regulator/ti-abb-regulator.c
index 20aab8f90e0803acb022e09db6dc183a9a1bf6df,1e0280536e72e0d87621f54f22924fe81864a836..b187b6bba7ad485a9a8d97ba248b0a70de89c5c8
--- 1/drivers/regulator/ti-abb-regulator.c
--- 2/drivers/regulator/ti-abb-regulator.c
+++ b/drivers/regulator/ti-abb-regulator.c
@@@ -767,9 -765,16 +767,14 @@@ static int ti_abb_probe(struct platform
  
        pname = "ldo-address";
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname);
+       if (!res) {
+               dev_dbg(dev, "Missing '%s' IO resource\n", pname);
+               ret = -ENODEV;
+               goto skip_opt;
+       }
        abb->ldo_base = devm_ioremap_resource(dev, res);
 -      if (IS_ERR(abb->ldo_base)) {
 -              ret = PTR_ERR(abb->ldo_base);
 -              goto err;
 -      }
 +      if (IS_ERR(abb->ldo_base))
 +              return PTR_ERR(abb->ldo_base);
  
        /* IF ldo_base is set, the following are mandatory */
        pname = "ti,ldovbb-override-mask";