summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:11:41 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:11:41 +0100
commit07afa93e3190b16d14afa0cd6a208ef21f157e6e (patch)
treea34b825cbb618cba2e43e0ed9bc8598ec9a4cd3f
parentaa11a358f88b371dee64a556eb7acc9ea05b0102 (diff)
parentbde251a9a813bfbb8f300abef265ecb7028c428f (diff)
downloadkernel-common-07afa93e3190b16d14afa0cd6a208ef21f157e6e.tar.gz
kernel-common-07afa93e3190b16d14afa0cd6a208ef21f157e6e.tar.bz2
kernel-common-07afa93e3190b16d14afa0cd6a208ef21f157e6e.zip
Merge remote-tracking branch 'regulator/topic/ti-abb' into regulator-next
-rw-r--r--drivers/regulator/ti-abb-regulator.c5
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)
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);