Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Oct 24, 2013
2 parents 706664c + 6653efb commit a611761
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/regulator/gpio-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a611761

Please sign in to comment.