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

diff --git a/drivers/regulator/ti-abb-regulator.c b/drivers/regulator/ti-abb-regulator.c
index 20aab8f90e0803acb022e09db6dc183a9a1bf6df..b187b6bba7ad485a9a8d97ba248b0a70de89c5c8 100644 (file)
--- a/drivers/regulator/ti-abb-regulator.c
+++ b/drivers/regulator/ti-abb-regulator.c
@@ -767,6 +767,11 @@ static int ti_abb_probe(struct platform_device *pdev)
 
        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))
                return PTR_ERR(abb->ldo_base);