diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:41 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:41 -0400 |
commit | 07afa93e3190b16d14afa0cd6a208ef21f157e6e (patch) | |
tree | a34b825cbb618cba2e43e0ed9bc8598ec9a4cd3f | |
parent | aa11a358f88b371dee64a556eb7acc9ea05b0102 (diff) | |
parent | bde251a9a813bfbb8f300abef265ecb7028c428f (diff) |
Merge remote-tracking branch 'regulator/topic/ti-abb' into regulator-next
-rw-r--r-- | drivers/regulator/ti-abb-regulator.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/regulator/ti-abb-regulator.c b/drivers/regulator/ti-abb-regulator.c index 20aab8f90e08..b187b6bba7ad 100644 --- 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) | |||
767 | 767 | ||
768 | pname = "ldo-address"; | 768 | pname = "ldo-address"; |
769 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname); | 769 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname); |
770 | if (!res) { | ||
771 | dev_dbg(dev, "Missing '%s' IO resource\n", pname); | ||
772 | ret = -ENODEV; | ||
773 | goto skip_opt; | ||
774 | } | ||
770 | abb->ldo_base = devm_ioremap_resource(dev, res); | 775 | abb->ldo_base = devm_ioremap_resource(dev, res); |
771 | if (IS_ERR(abb->ldo_base)) | 776 | if (IS_ERR(abb->ldo_base)) |
772 | return PTR_ERR(abb->ldo_base); | 777 | return PTR_ERR(abb->ldo_base); |