diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:36 +0100 |
| commit | a6117615a21323140e67d394a3301fd319468f1c (patch) | |
| tree | a22bb5b68d6da3943e1aa6fede852da665c29b4a /drivers/regulator | |
| parent | 706664c290d69f890a9e3acfc6a8196098459826 (diff) | |
| parent | 6653efb75dcac8fc61191cba9bd6dda99137bc44 (diff) | |
Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/gpio-regulator.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index 98a98ffa7fe..04406a918c0 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c @@ -283,7 +283,6 @@ static int gpio_regulator_probe(struct platform_device *pdev) dev_err(&pdev->dev, "No regulator type set\n"); ret = -EINVAL; goto err_memgpio; - break; } drvdata->nr_gpios = config->nr_gpios; |