git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 560c6b914c6ec7d9d9a69fddbb5bf3bf71433e8b Mon Sep 17 00:00:00 2001
   2 From: Qinglang Miao <miaoqinglang@huawei.com>
   3 Date: Tue, 3 Nov 2020 20:07:43 +0800
   4 Subject: iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume
   5
   6 From: Qinglang Miao <miaoqinglang@huawei.com>
   7
   8 commit 560c6b914c6ec7d9d9a69fddbb5bf3bf71433e8b upstream.
   9
  10 Fix the missing clk_disable_unprepare() of info->pclk
  11 before return from rockchip_saradc_resume in the error
  12 handling case when fails to prepare and enable info->clk.
  13
  14 Suggested-by: Robin Murphy <robin.murphy@arm.com>
  15 Fixes: 44d6f2ef94f9 ("iio: adc: add driver for Rockchip saradc")
  16 Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
  17 Cc: <Stable@vger.kernel.org>
  18 Link: https://lore.kernel.org/r/20201103120743.110662-1-miaoqinglang@huawei.com
  19 Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21
  22 ---
  23  drivers/iio/adc/rockchip_saradc.c |    2 +-
  24  1 file changed, 1 insertion(+), 1 deletion(-)
  25
  26 --- a/drivers/iio/adc/rockchip_saradc.c
  27 +++ b/drivers/iio/adc/rockchip_saradc.c
  28 @@ -384,7 +384,7 @@ static int rockchip_saradc_resume(struct
  29
  30         ret = clk_prepare_enable(info->clk);
  31         if (ret)
  32 -               return ret;
  33 +               clk_disable_unprepare(info->pclk);
  34
  35         return ret;
  36  }