diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0393-media-bcm2835-unicam-Correctly-handle-error-propagat.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0393-media-bcm2835-unicam-Correctly-handle-error-propagat.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0393-media-bcm2835-unicam-Correctly-handle-error-propagat.patch b/target/linux/bcm27xx/patches-5.10/950-0393-media-bcm2835-unicam-Correctly-handle-error-propagat.patch new file mode 100644 index 0000000000..455df46aac --- /dev/null +++ b/target/linux/bcm27xx/patches-5.10/950-0393-media-bcm2835-unicam-Correctly-handle-error-propagat.patch @@ -0,0 +1,27 @@ +From a9077829ddaaea3366c4ff9be8b98e7c85403a1c Mon Sep 17 00:00:00 2001 +From: Naushir Patuck <naush@raspberrypi.com> +Date: Wed, 2 Dec 2020 15:22:23 +0000 +Subject: [PATCH] media: bcm2835-unicam: Correctly handle error + propagation for stream on + +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 | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c ++++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c +@@ -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: |