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

2013-10-24 11:11:36 +01:00 · 2013-10-24 11:11:36 +01:00 · a6117615a2
--- 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;