Merge remote-tracking branch 'regulator/fix/tps80031' into tmp

1433d090 · Mark Brown · 3c3a6aae · d4cbca9e · 1433d090
Commit 1433d090 authored Jan 29, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/regulator/tps80031-regulator.c drivers/regulator/tps80031-regulator.c +1 -1

No files found.
--- a/drivers/regulator/tps80031-regulator.c
+++ b/drivers/regulator/tps80031-regulator.c
@@ -728,7 +728,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
 			}
 		}
 		rdev = regulator_register(&ri->rinfo->desc, &config);
-		if (IS_ERR_OR_NULL(rdev)) {
+		if (IS_ERR(rdev)) {
 			dev_err(&pdev->dev,
 				"register regulator failed %s\n",
 					ri->rinfo->desc.name);