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

This commit is contained in:
Mark Brown 2013-01-29 11:14:35 +08:00
commit 1433d0905f

View File

@ -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);