]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
media: rcar-vin: Always create a media pad
authorNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Fri, 13 Jun 2025 15:34:30 +0000 (17:34 +0200)
committerHans Verkuil <hverkuil@xs4all.nl>
Mon, 16 Jun 2025 06:52:15 +0000 (08:52 +0200)
Prepare for Gen2 media graph support by always initializing a media pad
for the VIN device.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Link: https://lore.kernel.org/r/20250613153434.2001800-10-niklas.soderlund+renesas@ragnatech.se
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
drivers/media/platform/renesas/rcar-vin/rcar-core.c

index b3558c3c44d10259d3558f4325395e20c5d84baf..7367b5c993cd21493b5456979018fcc8e95724d2 100644 (file)
@@ -895,10 +895,6 @@ static int rvin_csi2_init(struct rvin_dev *vin)
 {
        int ret;
 
-       vin->pad.flags = MEDIA_PAD_FL_SINK;
-       ret = media_entity_pads_init(&vin->vdev.entity, 1, &vin->pad);
-       if (ret)
-               return ret;
 
        ret = rvin_create_controls(vin, NULL);
        if (ret < 0)
@@ -980,10 +976,6 @@ static int rvin_isp_init(struct rvin_dev *vin)
 {
        int ret;
 
-       vin->pad.flags = MEDIA_PAD_FL_SINK;
-       ret = media_entity_pads_init(&vin->vdev.entity, 1, &vin->pad);
-       if (ret)
-               return ret;
 
        ret = rvin_create_controls(vin, NULL);
        if (ret < 0)
@@ -1377,6 +1369,11 @@ static int rcar_vin_probe(struct platform_device *pdev)
                goto err_dma;
        }
 
+       vin->pad.flags = MEDIA_PAD_FL_SINK;
+       ret = media_entity_pads_init(&vin->vdev.entity, 1, &vin->pad);
+       if (ret)
+               goto err_id;
+
        if (vin->info->use_isp) {
                ret = rvin_isp_init(vin);
        } else if (vin->info->use_mc) {