]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: clk-wm831x: fix a logic error
authorPan Bian <bianpan2016@163.com>
Thu, 1 Dec 2016 06:25:44 +0000 (14:25 +0800)
committerWilly Tarreau <w@1wt.eu>
Wed, 7 Jun 2017 22:46:53 +0000 (00:46 +0200)
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: Willy Tarreau <w@1wt.eu>
drivers/clk/clk-wm831x.c

index 917a3ab482f9ac4831c91b48b4a5a6401fb6fc4c..e2e5e76e9805f0c22c2ff9d897f8fe1441d1430a 100644 (file)
@@ -248,7 +248,7 @@ static int wm831x_clkout_is_enabled(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;