summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:50:22 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:50:22 +0100
commit2d31b15b868b5369eb326464e6634ea5afba7a44 (patch)
tree5cc331e0a27824b3315b9ee522429c898b7d41c2 /drivers
parent04fcec88cdd050ae1cecf7cc7fabf50bd48b8cba (diff)
parentcf06cbb9a08d70e4a69f0ce7962df6bcf7405eae (diff)
downloadlinux-2d31b15b868b5369eb326464e6634ea5afba7a44.tar.gz
linux-2d31b15b868b5369eb326464e6634ea5afba7a44.tar.bz2
linux-2d31b15b868b5369eb326464e6634ea5afba7a44.zip
Merge remote-tracking branch 'regulator/topic/ti-abb' into regulator-next
Diffstat (limited to 'drivers')
-rw-r--r--drivers/regulator/ti-abb-regulator.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/regulator/ti-abb-regulator.c b/drivers/regulator/ti-abb-regulator.c
index 3753ed05e719..d8e3e1262bc2 100644
--- 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);