media: bcm2835-unicam: Correctly handle error propagation for stream on
authorNaushir Patuck <naush@raspberrypi.com>
Wed, 2 Dec 2020 15:22:23 +0000 (15:22 +0000)
committerDom Cobley <popcornmix@gmail.com>
Mon, 21 Mar 2022 16:04:09 +0000 (16:04 +0000)
On a failure in start_streaming(), the error code would not propagate to
the calling function on all conditions. This would cause the userland
caller to not know of the failure.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
drivers/media/platform/bcm2835/bcm2835-unicam.c

index 6501fb2..c13a0a2 100644 (file)
@@ -1730,8 +1730,7 @@ err_disable_unicam:
        unicam_disable(dev);
        clk_disable_unprepare(dev->clock);
 err_vpu_clock:
-       ret = clk_set_min_rate(dev->vpu_clock, 0);
-       if (ret)
+       if (clk_set_min_rate(dev->vpu_clock, 0))
                unicam_err(dev, "failed to reset the VPU clock\n");
        clk_disable_unprepare(dev->vpu_clock);
 err_pm_put: