diff options
author | Pan Bian <bianpan2016@163.com> | 2016-12-01 14:25:44 +0800 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2017-03-16 02:26:31 +0000 |
commit | 2e77516251731da8c46ed90934e711259133c0a1 (patch) | |
tree | 8797795873a0b81f274d45a2461181598b2b8725 /drivers/clk/clk-wm831x.c | |
parent | 077d7a1314b8ab402f8f649f7a2955246e8dc682 (diff) | |
download | linux-stable-2e77516251731da8c46ed90934e711259133c0a1.tar.gz linux-stable-2e77516251731da8c46ed90934e711259133c0a1.tar.bz2 linux-stable-2e77516251731da8c46ed90934e711259133c0a1.zip |
clk: clk-wm831x: fix a logic error
commit 20979202ee6e4c68dab7bcf408787225a656d18e upstream.
Fix bug https://bugzilla.kernel.org/show_bug.cgi?id=188561. Function
wm831x_clkout_is_prepared() returns "true" when it fails to read
CLOCK_CONTROL_1. "true" means the device is already prepared. So
return "true" on the read failure seems improper.
Signed-off-by: Pan Bian <bianpan2016@163.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Fixes: f05259a6ffa4 ("clk: wm831x: Add initial WM831x clock driver")
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/clk/clk-wm831x.c')
-rw-r--r-- | drivers/clk/clk-wm831x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-wm831x.c b/drivers/clk/clk-wm831x.c index b131041c8f48..093dfe159dfb 100644 --- a/drivers/clk/clk-wm831x.c +++ b/drivers/clk/clk-wm831x.c @@ -248,7 +248,7 @@ static int wm831x_clkout_is_prepared(struct clk_hw *hw) if (ret < 0) { dev_err(wm831x->dev, "Unable to read CLOCK_CONTROL_1: %d\n", ret); - return true; + return false; } return (ret & WM831X_CLKOUT_ENA) != 0; |