diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2025-12-11 14:20:22 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil+cisco@kernel.org> | 2026-01-13 12:47:56 +0100 |
| commit | dc6c52205bdaddf1dc259497a958402b35c01fe2 (patch) | |
| tree | abd6cb352631f2837054e7a3a2170716c238e55c | |
| parent | 58410f62e25d5981fcca7e2e768e4e182ce2200e (diff) | |
media: ipu6: Always call video_device_pipeline_alloc_start()
Even if a video device is part of a pipeline already,
video_device_pipeline_alloc_start() handles that case gracefully. Don't
explicitly differentiate between video_device_pipeline_start() and
video_device_pipeline_alloc_start() based on the existence of a pipeline.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Mehdi Djait <mehdi.djait@linux.intel.com> # Dell XPS 9315
Reviewed-by: Mehdi Djait <mehdi.djait@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
| -rw-r--r-- | drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 1 | ||||
| -rw-r--r-- | drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c index c862de31af9c..fabaed63df0c 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c @@ -427,7 +427,6 @@ static int ipu6_isys_link_fmt_validate(struct ipu6_isys_queue *aq) media_pad_remote_pad_first(av->vdev.entity.pads); struct v4l2_subdev *sd; u32 r_stream, code; - int ret; if (!remote_pad) return -ENOTCONN; diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c index e9dab8a709ef..3ac48d2076da 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c @@ -1176,7 +1176,6 @@ int ipu6_isys_setup_video(struct ipu6_isys_video *av, struct v4l2_subdev *remote_sd = media_entity_to_v4l2_subdev(remote_pad->entity); struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(remote_sd); - struct media_pipeline *pipeline; int ret = -EINVAL; *nr_queues = 0; @@ -1216,11 +1215,7 @@ int ipu6_isys_setup_video(struct ipu6_isys_video *av, return ret; } - pipeline = media_entity_pipeline(&av->vdev.entity); - if (!pipeline) - ret = video_device_pipeline_alloc_start(&av->vdev); - else - ret = video_device_pipeline_start(&av->vdev, pipeline); + ret = video_device_pipeline_alloc_start(&av->vdev); if (ret < 0) { dev_dbg(dev, "media pipeline start failed\n"); return ret; |