diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-30 06:58:39 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-30 06:58:39 -0400 |
| commit | 2a66a854f5d716bb67e24dba78e53bdd5f0253ad (patch) | |
| tree | ab04ffd19996915e2cc4b7f32045f33bac68bdf9 /drivers/regulator | |
| parent | e4bf063cb8b5e3648aa9917692b185068ab8ba23 (diff) | |
| parent | 31d6eebf7e079cfb5e98e65d5af4c6de093e076c (diff) | |
Merge remote-tracking branch 'regulator/fix/doc' into regulator-linus
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 5e50b20f0f96..815d6df8bd5f 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
| @@ -1539,7 +1539,10 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev) | |||
| 1539 | } | 1539 | } |
| 1540 | 1540 | ||
| 1541 | /** | 1541 | /** |
| 1542 | * Balance enable_count of each GPIO and actual GPIO pin control. | 1542 | * regulator_ena_gpio_ctrl - balance enable_count of each GPIO and actual GPIO pin control |
| 1543 | * @rdev: regulator_dev structure | ||
| 1544 | * @enable: enable GPIO at initial use? | ||
| 1545 | * | ||
| 1543 | * GPIO is enabled in case of initial use. (enable_count is 0) | 1546 | * GPIO is enabled in case of initial use. (enable_count is 0) |
| 1544 | * GPIO is disabled when it is not shared any more. (enable_count <= 1) | 1547 | * GPIO is disabled when it is not shared any more. (enable_count <= 1) |
| 1545 | */ | 1548 | */ |