diff options
| author | Arnd Bergmann | 2015-10-09 17:08:28 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2015-10-09 17:08:28 +0200 |
| commit | 273395f0c2973b96a35772f8aa3b65c25517a45d (patch) | |
| tree | 4b3394740f1b35773acab4341af1843fefc96b4f /drivers/base | |
| parent | Merge tag 'at91-cleanup-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | soc: rockchip: power-domain: Add power domain driver (diff) | |
| download | kernel-qcow2-linux-273395f0c2973b96a35772f8aa3b65c25517a45d.tar.gz kernel-qcow2-linux-273395f0c2973b96a35772f8aa3b65c25517a45d.tar.xz kernel-qcow2-linux-273395f0c2973b96a35772f8aa3b65c25517a45d.zip | |
Merge tag 'v4.4-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/drivers
Merge "Rockchip power-domain drivers for 4.4" from Heiko Stuebner:
Add the power-domain base-driver which currently contains
support for the rk3288 powerdomain layout but can be easily
extended for the socs (including arm64) later on.
A big thanks to Ceasar Wang for pulling through on this
during 18 revisions.
Also included is a fix to the pm-clock handling in the generic
powerdomains to adapt it to the per-user clock handling we now
do, Acked by Rafael Wysocki.
* tag 'v4.4-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
soc: rockchip: power-domain: Add power domain driver
dt-bindings: add document of Rockchip power domains
PM / clk: Do not __clk_get passed in clock-references
dt-bindings: add power-domain header for RK3288 SoCs
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/clock_ops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c index 652b5a367c1f..6ce76934057f 100644 --- a/drivers/base/power/clock_ops.c +++ b/drivers/base/power/clock_ops.c @@ -93,7 +93,7 @@ static int __pm_clk_add(struct device *dev, const char *con_id, return -ENOMEM; } } else { - if (IS_ERR(clk) || !__clk_get(clk)) { + if (IS_ERR(clk)) { kfree(ce); return -ENOENT; } @@ -127,7 +127,9 @@ int pm_clk_add(struct device *dev, const char *con_id) * @clk: Clock pointer * * Add the clock to the list of clocks used for the power management of @dev. - * It will increment refcount on clock pointer, use clk_put() on it when done. + * The power-management code will take control of the clock reference, so + * callers should not call clk_put() on @clk after this function sucessfully + * returned. */ int pm_clk_add_clk(struct device *dev, struct clk *clk) { |