Commit 21e55ca4 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next

parents 41f59832 10835600
......@@ -389,7 +389,7 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
int id;
int err;
dev_dbg(&pdev->dev, "Probing regulator %d\n", id);
dev_dbg(&pdev->dev, "Probing regulator\n");
pdata = dev_get_platdata(pdev->dev.parent);
if ((!pdata) && (pdev->dev.parent->of_node))
......
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