mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next
This commit is contained in:
commit
a6117615a2
1 changed files with 0 additions and 1 deletions
|
@ -283,7 +283,6 @@ static int gpio_regulator_probe(struct platform_device *pdev)
|
||||||
dev_err(&pdev->dev, "No regulator type set\n");
|
dev_err(&pdev->dev, "No regulator type set\n");
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto err_memgpio;
|
goto err_memgpio;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
drvdata->nr_gpios = config->nr_gpios;
|
drvdata->nr_gpios = config->nr_gpios;
|
||||||
|
|
Loading…
Reference in a new issue