diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-05 14:14:34 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-05 14:14:34 +0300 |
| commit | 15db0c8d79b353e4a5b62aef6863ffac4b36cf8d (patch) | |
| tree | d7c7d3e266150753224a7bc8141185826b8d8513 /drivers/regulator | |
| parent | 70c97e3b11e9f92b5fdd6404ff44dd8cf9d0e26e (diff) | |
| parent | 60a2362f769cf549dc466134efe71c8bf9fbaaba (diff) | |
| download | linux-15db0c8d79b353e4a5b62aef6863ffac4b36cf8d.tar.xz | |
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index cd87c0c37034..47a455cfe04f 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -828,7 +828,7 @@ static void print_constraints(struct regulator_dev *rdev) if (!count) sprintf(buf, "no parameters"); - rdev_info(rdev, "%s\n", buf); + rdev_dbg(rdev, "%s\n", buf); if ((constraints->min_uV != constraints->max_uV) && !(constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) @@ -1713,6 +1713,8 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev) gpiod_put(pin->gpiod); list_del(&pin->list); kfree(pin); + rdev->ena_pin = NULL; + return; } else { pin->request_count--; } |