diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:36 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:36 -0400 |
| commit | a6117615a21323140e67d394a3301fd319468f1c (patch) | |
| tree | a22bb5b68d6da3943e1aa6fede852da665c29b4a | |
| parent | 706664c290d69f890a9e3acfc6a8196098459826 (diff) | |
| parent | 6653efb75dcac8fc61191cba9bd6dda99137bc44 (diff) | |
Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next
| -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 98a98ffa7fe0..04406a918c04 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) | |||
| 283 | dev_err(&pdev->dev, "No regulator type set\n"); | 283 | dev_err(&pdev->dev, "No regulator type set\n"); |
| 284 | ret = -EINVAL; | 284 | ret = -EINVAL; |
| 285 | goto err_memgpio; | 285 | goto err_memgpio; |
| 286 | break; | ||
| 287 | } | 286 | } |
| 288 | 287 | ||
| 289 | drvdata->nr_gpios = config->nr_gpios; | 288 | drvdata->nr_gpios = config->nr_gpios; |