lkml.org 
[lkml]   [2017]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 120/235] clk: clk-wm831x: fix a logic error
    Date
    From: Pan Bian <bianpan2016@163.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/clk/clk-wm831x.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/clk/clk-wm831x.c b/drivers/clk/clk-wm831x.c
    index 805b4c344006..ee5f2c985f4d 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;
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-01-27 12:45    [W:2.244 / U:0.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site