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

Commit 02fcc84a authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 924ee2c9 15684347

drivers/regulator/gpio-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev) 
	drvdata->state = state;



	drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev,

					  config->init_data, drvdata);

					  config->init_data, drvdata, NULL);

	if (IS_ERR(drvdata->dev)) {

		ret = PTR_ERR(drvdata->dev);

		dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);