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

git-mirror · Jan 29, 2013 · 1433d09 · 1433d09
2 parents 3c3a6aa + d4cbca9
commit 1433d09
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);