mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
|
From 60aa38baa83748d837b2c6faee1868c933702bf8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
||
|
|
Date: Mon, 24 Oct 2022 13:57:23 +0100
|
||
|
|
Subject: [PATCH 0391/1085] media: bcm2835-unicam: Fix up start/stop api change
|
||
|
|
|
||
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
||
|
|
---
|
||
|
|
drivers/media/platform/bcm2835/bcm2835-unicam.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
|
||
|
|
+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
|
||
|
|
@@ -2524,7 +2524,7 @@ static int unicam_start_streaming(struct
|
||
|
|
goto err_streaming;
|
||
|
|
}
|
||
|
|
|
||
|
|
- ret = media_pipeline_start(&node->video_dev.entity, &node->pipe);
|
||
|
|
+ ret = media_pipeline_start(node->video_dev.entity.pads, &node->pipe);
|
||
|
|
if (ret < 0) {
|
||
|
|
unicam_err(dev, "Failed to start media pipeline: %d\n", ret);
|
||
|
|
goto err_pm_put;
|
||
|
|
@@ -2618,7 +2618,7 @@ err_vpu_clock:
|
||
|
|
unicam_err(dev, "failed to reset the VPU clock\n");
|
||
|
|
clk_disable_unprepare(dev->vpu_clock);
|
||
|
|
error_pipeline:
|
||
|
|
- media_pipeline_stop(&node->video_dev.entity);
|
||
|
|
+ media_pipeline_stop(node->video_dev.entity.pads);
|
||
|
|
err_pm_put:
|
||
|
|
unicam_runtime_put(dev);
|
||
|
|
err_streaming:
|
||
|
|
@@ -2646,7 +2646,7 @@ static void unicam_stop_streaming(struct
|
||
|
|
|
||
|
|
unicam_disable(dev);
|
||
|
|
|
||
|
|
- media_pipeline_stop(&node->video_dev.entity);
|
||
|
|
+ media_pipeline_stop(node->video_dev.entity.pads);
|
||
|
|
|
||
|
|
if (dev->clocks_enabled) {
|
||
|
|
if (clk_set_min_rate(dev->vpu_clock, 0))
|