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

diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 98a98ffa7fe07d2bcb23f2c9cad593b416aaf203..04406a918c041b5773adcf9adf331eadf289caf4 100644 (file)
--- 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;