lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 229/242] iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume
    Date
    From: Qinglang Miao <miaoqinglang@huawei.com>

    commit 560c6b914c6ec7d9d9a69fddbb5bf3bf71433e8b upstream.

    Fix the missing clk_disable_unprepare() of info->pclk
    before return from rockchip_saradc_resume in the error
    handling case when fails to prepare and enable info->clk.

    Suggested-by: Robin Murphy <robin.murphy@arm.com>
    Fixes: 44d6f2ef94f9 ("iio: adc: add driver for Rockchip saradc")
    Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
    Cc: <Stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20201103120743.110662-1-miaoqinglang@huawei.com
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/iio/adc/rockchip_saradc.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/iio/adc/rockchip_saradc.c
    +++ b/drivers/iio/adc/rockchip_saradc.c
    @@ -384,7 +384,7 @@ static int rockchip_saradc_resume(struct

    ret = clk_prepare_enable(info->clk);
    if (ret)
    - return ret;
    + clk_disable_unprepare(info->pclk);

    return ret;
    }

    \
     
     \ /
      Last update: 2020-12-28 17:40    [W:2.171 / U:1.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site