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

…next
git-mirror · Oct 24, 2013 · 07afa93 · 07afa93
2 parents aa11a35 + bde251a
commit 07afa93
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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);