diff options
| author | Stephen Boyd | 2014-12-13 00:04:16 +0100 |
|---|---|---|
| committer | Michael Turquette | 2014-12-16 02:02:06 +0100 |
| commit | 89f7e9de59bf3e3cda2e00de12c66db22675a7cf (patch) | |
| tree | 5c6581ff9dfb4fd9574025ef10aeb645b5835176 /drivers/clk/clk.c | |
| parent | Merge tag 'for-v3.19-exynos-clk-2' of git://linuxtv.org/snawrocki/samsung int... (diff) | |
| download | kernel-qcow2-linux-89f7e9de59bf3e3cda2e00de12c66db22675a7cf.tar.gz kernel-qcow2-linux-89f7e9de59bf3e3cda2e00de12c66db22675a7cf.tar.xz kernel-qcow2-linux-89f7e9de59bf3e3cda2e00de12c66db22675a7cf.zip | |
clk: Really fix deadlock with mmap_sem
Commit 6314b6796e3c (clk: Don't hold prepare_lock across debugfs
creation, 2014-09-04) forgot to update one place where we hold
the prepare_lock while creating debugfs directories. This means
we still have the chance of a deadlock that the commit was trying
to fix. Actually fix it by moving the debugfs creation outside
the prepare_lock.
Cc: <stable@vger.kernel.org> # 3.18
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Fixes: 6314b6796e3c "clk: Don't hold prepare_lock across debugfs creation"
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Michael Turquette <mturquette@linaro.org>
[mturquette@linaro.org: removed lockdep_assert]
Diffstat (limited to 'drivers/clk/clk.c')
| -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 = { .release = single_release, }; -/* caller must hold prepare_lock */ static int clk_debug_create_one(struct clk *clk, struct dentry *pdentry) { struct dentry *d; @@ -1944,7 +1943,6 @@ int __clk_init(struct device *dev, struct clk *clk) else clk->rate = 0; - clk_debug_register(clk); /* * walk the list of orphan clocks and reparent any that are children of * this clock @@ -1979,6 +1977,9 @@ int __clk_init(struct device *dev, struct clk *clk) out: clk_prepare_unlock(); + if (!ret) + clk_debug_register(clk); + return ret; } |