Commit 1433d090 authored by Mark Brown's avatar Mark Brown

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

parents 3c3a6aae d4cbca9e
...@@ -728,7 +728,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev) ...@@ -728,7 +728,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
} }
} }
rdev = regulator_register(&ri->rinfo->desc, &config); rdev = regulator_register(&ri->rinfo->desc, &config);
if (IS_ERR_OR_NULL(rdev)) { if (IS_ERR(rdev)) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"register regulator failed %s\n", "register regulator failed %s\n",
ri->rinfo->desc.name); ri->rinfo->desc.name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment