Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents 41f59832 10835600

drivers/regulator/tps6586x-regulator.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -389,7 +389,7 @@ static int tps6586x_regulator_probe(struct platform_device *pdev) 
	int id;

	int id;

	int err;

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

	pdata = dev_get_platdata(pdev->dev.parent);

	if ((!pdata) && (pdev->dev.parent->of_node))

	if ((!pdata) && (pdev->dev.parent->of_node))