Re: [PATCH] Enable clock before calling clk_get_rate() on it.

From: Evgeniy Polyakov
Date: Mon Apr 30 2018 - 11:10:16 EST


Hi Stefan

Nice catch, thank you!

19.04.2018, 16:02, "Stefan Potyra" <stefan.potyra@xxxxxxxxxxxxxx>:
> According to the API, you may only call clk_get_rate() after actually
> enabling it.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Fixes: a5fd9139f74c w1: add 1-wire master driver for i.MX27 / i.MX31
> Signed-off-by: Stefan Potyra <Stefan.Potyra@xxxxxxxxxxxxxx>

Acked-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>

Greg, please pull it into your tree. Is this a stable material?

> ---
> Âdrivers/w1/masters/mxc_w1.c | 8 ++++----
> Â1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
> index 74f2e6e6202a..a9599027d4ef 100644
> --- a/drivers/w1/masters/mxc_w1.c
> +++ b/drivers/w1/masters/mxc_w1.c
> @@ -112,6 +112,10 @@ static int mxc_w1_probe(struct platform_device *pdev)
> ÂÂÂÂÂÂÂÂÂif (IS_ERR(mdev->clk))
> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂreturn PTR_ERR(mdev->clk);
>
> + err = clk_prepare_enable(mdev->clk);
> + if (err)
> + return err;
> +
> ÂÂÂÂÂÂÂÂÂclkrate = clk_get_rate(mdev->clk);
> ÂÂÂÂÂÂÂÂÂif (clkrate < 10000000)
> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂdev_warn(&pdev->dev,
> @@ -128,10 +132,6 @@ static int mxc_w1_probe(struct platform_device *pdev)
> ÂÂÂÂÂÂÂÂÂif (IS_ERR(mdev->regs))
> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂreturn PTR_ERR(mdev->regs);
>
> - err = clk_prepare_enable(mdev->clk);
> - if (err)
> - return err;
> -
> ÂÂÂÂÂÂÂÂÂ/* Software reset 1-Wire module */
> ÂÂÂÂÂÂÂÂÂwriteb(MXC_W1_RESET_RST, mdev->regs + MXC_W1_RESET);
> ÂÂÂÂÂÂÂÂÂwriteb(0, mdev->regs + MXC_W1_RESET);
> --
> 2.17.0