On Sun, 10 Mar 2019 14:58:26 -0400
Sven Van Asbroeck <thesve...@gmail.com> wrote:

> In remove, the clock is disabled before canceling the
> delayed work. This means that the delayed work may be
> touching unclocked hardware.
> 
> Fix by disabling the clock after the delayed work is
> fully canceled. This is consistent with the probe error
> path order.
> 
> Signed-off-by: Sven Van Asbroeck <thesve...@gmail.com>
Applied to the fixes-togreg branch of iio.git.

Thanks,

Jonathan

> ---
>  drivers/iio/adc/xilinx-xadc-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/adc/xilinx-xadc-core.c 
> b/drivers/iio/adc/xilinx-xadc-core.c
> index 15e1a103f37d..1ae86e7359f7 100644
> --- a/drivers/iio/adc/xilinx-xadc-core.c
> +++ b/drivers/iio/adc/xilinx-xadc-core.c
> @@ -1320,8 +1320,8 @@ static int xadc_remove(struct platform_device *pdev)
>               iio_triggered_buffer_cleanup(indio_dev);
>       }
>       free_irq(xadc->irq, indio_dev);
> -     clk_disable_unprepare(xadc->clk);
>       cancel_delayed_work_sync(&xadc->zynq_unmask_work);
> +     clk_disable_unprepare(xadc->clk);
>       kfree(xadc->data);
>       kfree(indio_dev->channels);
>  

Reply via email to