diff options
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/clk.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index e5d5dc13bcfd..687b00d67c8a 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c | |||
@@ -903,7 +903,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate) | |||
903 | if (rate == clk->rate) | 903 | if (rate == clk->rate) |
904 | goto out; | 904 | goto out; |
905 | 905 | ||
906 | if ((clk->flags & CLK_SET_RATE_GATE) && __clk_is_enabled(clk)) { | 906 | if ((clk->flags & CLK_SET_RATE_GATE) && clk->prepare_count) { |
907 | ret = -EBUSY; | 907 | ret = -EBUSY; |
908 | goto out; | 908 | goto out; |
909 | } | 909 | } |
@@ -1420,6 +1420,15 @@ fail_out: | |||
1420 | } | 1420 | } |
1421 | EXPORT_SYMBOL_GPL(clk_register); | 1421 | EXPORT_SYMBOL_GPL(clk_register); |
1422 | 1422 | ||
1423 | /** | ||
1424 | * clk_unregister - unregister a currently registered clock | ||
1425 | * @clk: clock to unregister | ||
1426 | * | ||
1427 | * Currently unimplemented. | ||
1428 | */ | ||
1429 | void clk_unregister(struct clk *clk) {} | ||
1430 | EXPORT_SYMBOL_GPL(clk_unregister); | ||
1431 | |||
1423 | /*** clk rate change notifiers ***/ | 1432 | /*** clk rate change notifiers ***/ |
1424 | 1433 | ||
1425 | /** | 1434 | /** |