git.openwrt.org Git - openwrt/staging/rmilecki.git/blob

   1 From a9077829ddaaea3366c4ff9be8b98e7c85403a1c Mon Sep 17 00:00:00 2001
   2 From: Naushir Patuck <naush@raspberrypi.com>
   3 Date: Wed, 2 Dec 2020 15:22:23 +0000
   4 Subject: [PATCH] media: bcm2835-unicam: Correctly handle error
   5  propagation for stream on
   6
   7 On a failure in start_streaming(), the error code would not propagate to
   8 the calling function on all conditions. This would cause the userland
   9 caller to not know of the failure.
  10
  11 Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  12 ---
  13  drivers/media/platform/bcm2835/bcm2835-unicam.c | 3 +--
  14  1 file changed, 1 insertion(+), 2 deletions(-)
  15
  16 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
  17 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
  18 @@ -1730,8 +1730,7 @@ err_disable_unicam:
  19         unicam_disable(dev);
  20         clk_disable_unprepare(dev->clock);
  21  err_vpu_clock:
  22 -       ret = clk_set_min_rate(dev->vpu_clock, 0);
  23 -       if (ret)
  24 +       if (clk_set_min_rate(dev->vpu_clock, 0))
  25                 unicam_err(dev, "failed to reset the VPU clock\n");
  26         clk_disable_unprepare(dev->vpu_clock);
  27  err_pm_put: