From bffad37e28b7c39543847568664635514f5a2533 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 4 Oct 2023 09:39:59 +0100 Subject: [PATCH 0652/1085] media: rp1: cfe: Fail streaming if FE_CONFIG node is not enabled When the FE is enabled, ensure that the FE_CONFIG node is enabled. Otherwise fail cfe_start_streaming() entirely. Signed-off-by: Naushir Patuck --- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c +++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c @@ -997,6 +997,14 @@ static int cfe_start_streaming(struct vb goto err_streaming; } + /* When using the Frontend, we must enable the FE_CONFIG node. */ + if (is_fe_enabled(cfe) && + !check_state(cfe, NODE_ENABLED, cfe->node[FE_CONFIG].id)) { + cfe_err("FE enabled, but FE_CONFIG node is not\n"); + ret = -EINVAL; + goto err_streaming; + } + ret = media_pipeline_start(&node->pad, &cfe->pipe); if (ret < 0) { cfe_err("Failed to start media pipeline: %d\n", ret);