Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / regulator / ti-abb-regulator.c

diff --git a/drivers/regulator/ti-abb-regulator.c b/drivers/regulator/ti-abb-regulator.c
index 3753ed05e71920085c8bbff804a8728b037c7e72..d8e3e1262bc2960b4eebf89b5c552ef6e04df305 100644 (file)
--- a/drivers/regulator/ti-abb-regulator.c
+++ b/drivers/regulator/ti-abb-regulator.c
@@ -717,11 +717,6 @@ static int ti_abb_probe(struct platform_device *pdev)
        /* Map ABB resources */
        pname = "base-address";
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname);
-       if (!res) {
-               dev_err(dev, "Missing '%s' IO resource\n", pname);
-               ret = -ENODEV;
-               goto err;
-       }
        abb->base = devm_ioremap_resource(dev, res);
        if (IS_ERR(abb->base)) {
                ret = PTR_ERR(abb->base);
@@ -770,11 +765,6 @@ 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)) {
                ret = PTR_ERR(abb->ldo_base);