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

a6117615 · Mark Brown · 706664c2 · 6653efb7 · a6117615
Commit a6117615 authored Oct 24, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

drivers/regulator/gpio-regulator.c drivers/regulator/gpio-regulator.c +0 -1

No files found.
--- 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;