mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-15 21:23:23 +00:00
Merge remote-tracking branch 'regulator/topic/dt' into regulator-next
This commit is contained in:
commit
02fcc84ae5
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user