media: staging: ipu3-imgu: Set fields before media_entity_pads_init()

The imgu driver fails to probe with the following message because it
does not set the pad's flags before calling media_entity_pads_init().

[   14.596315] ipu3-imgu 0000:00:05.0: failed initialize subdev media entity (-22)
[   14.596322] ipu3-imgu 0000:00:05.0: failed to register subdev0 ret (-22)
[   14.596327] ipu3-imgu 0000:00:05.0: failed to register pipes (-22)
[   14.596331] ipu3-imgu 0000:00:05.0: failed to create V4L2 devices (-22)

Fix the initialization order so that the driver probe succeeds. The ops
initialization is also moved together for readability.

Fixes: a0ca1627b450 ("media: staging/intel-ipu3: Add v4l2 driver based on media framework")
Cc: <stable@vger.kernel.org> # 6.7
Cc: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Hidenori Kobayashi <hidenorik@chromium.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
index a66f034380c057e5e6a97c23497ab225b31f3761..3df58eb3e8822b5eea8c3e70937841be6f2ca31c 100644 (file)
--- a/drivers/staging/media/ipu3/ipu3-v4l2.c
+++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
@@ -1069,6 +1069,11 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu,
        struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];
 
        /* Initialize subdev media entity */
+       imgu_sd->subdev.entity.ops = &imgu_media_ops;
+       for (i = 0; i < IMGU_NODE_NUM; i++) {
+               imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ?
+                       MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
+       }
        r = media_entity_pads_init(&imgu_sd->subdev.entity, IMGU_NODE_NUM,
                                   imgu_sd->subdev_pads);
        if (r) {
@@ -1076,11 +1081,6 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu,
                        "failed initialize subdev media entity (%d)\n", r);
                return r;
        }
-       imgu_sd->subdev.entity.ops = &imgu_media_ops;
-       for (i = 0; i < IMGU_NODE_NUM; i++) {
-               imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ?
-                       MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
-       }
 
        /* Initialize subdev */
        v4l2_subdev_init(&imgu_sd->subdev, &imgu_subdev_ops);
@@ -1177,15 +1177,15 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe,
        }
 
        /* Initialize media entities */
+       node->vdev_pad.flags = node->output ?
+               MEDIA_PAD_FL_SOURCE : MEDIA_PAD_FL_SINK;
+       vdev->entity.ops = NULL;
        r = media_entity_pads_init(&vdev->entity, 1, &node->vdev_pad);
        if (r) {
                dev_err(dev, "failed initialize media entity (%d)\n", r);
                mutex_destroy(&node->lock);
                return r;
        }
-       node->vdev_pad.flags = node->output ?
-               MEDIA_PAD_FL_SOURCE : MEDIA_PAD_FL_SINK;
-       vdev->entity.ops = NULL;
 
        /* Initialize vbq */
        vbq->type = node->vdev_fmt.type;