2016-12-01 06:26:35

by Pan Bian

Subject: [PATCH 1/1] clk: clk-wm831x: fix a logic error

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 <[email protected]>
---
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 f4fdac5..0621fbf 100644
--- a/drivers/clk/clk-wm831x.c
+++ b/drivers/clk/clk-wm831x.c
@@ -243,7 +243,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;
--
1.9.1

2016-12-01 09:32:14

by Charles Keepax

Subject: Re: [PATCH 1/1] clk: clk-wm831x: fix a logic error

On Thu, Dec 01, 2016 at 02:25:44PM +0800, Pan Bian wrote:
> 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 <[email protected]>
> ---

Looks good to me:

Acked-by: Charles Keepax <[email protected]>

Thanks,
Charles

2016-12-08 00:23:47

by Stephen Boyd

Subject: Re: [PATCH 1/1] clk: clk-wm831x: fix a logic error

On 12/01, Pan Bian wrote:
> 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 <[email protected]>
> ---

Applied to clk-next

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project