mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-22 04:56:15 +00:00
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
From 4ad50299c46141bdc930bba4030bcb55c61921f5 Mon Sep 17 00:00:00 2001
|
|
From: Naushir Patuck <naush@raspberrypi.com>
|
|
Date: Wed, 2 Dec 2020 15:22:23 +0000
|
|
Subject: [PATCH 0266/1085] 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
|
|
@@ -1732,8 +1732,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:
|