diff options
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/clk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 44cdc47a6cc5..f4963b7d4e17 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c | |||
@@ -240,7 +240,6 @@ static const struct file_operations clk_dump_fops = { | |||
240 | .release = single_release, | 240 | .release = single_release, |
241 | }; | 241 | }; |
242 | 242 | ||
243 | /* caller must hold prepare_lock */ | ||
244 | static int clk_debug_create_one(struct clk *clk, struct dentry *pdentry) | 243 | static int clk_debug_create_one(struct clk *clk, struct dentry *pdentry) |
245 | { | 244 | { |
246 | struct dentry *d; | 245 | struct dentry *d; |
@@ -1944,7 +1943,6 @@ int __clk_init(struct device *dev, struct clk *clk) | |||
1944 | else | 1943 | else |
1945 | clk->rate = 0; | 1944 | clk->rate = 0; |
1946 | 1945 | ||
1947 | clk_debug_register(clk); | ||
1948 | /* | 1946 | /* |
1949 | * walk the list of orphan clocks and reparent any that are children of | 1947 | * walk the list of orphan clocks and reparent any that are children of |
1950 | * this clock | 1948 | * this clock |
@@ -1979,6 +1977,9 @@ int __clk_init(struct device *dev, struct clk *clk) | |||
1979 | out: | 1977 | out: |
1980 | clk_prepare_unlock(); | 1978 | clk_prepare_unlock(); |
1981 | 1979 | ||
1980 | if (!ret) | ||
1981 | clk_debug_register(clk); | ||
1982 | |||
1982 | return ret; | 1983 | return ret; |
1983 | } | 1984 | } |
1984 | 1985 | ||