Commit 56c8534e authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: rkisp1: capture: Initialize entity before video device 



The media_entity embedded in the video_device needs to be initialized
before registering the video_device. Do so.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarDafna Hirschfeld <dafna@fastmail.com>
Reviewed-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Reviewed-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 945a9a8e

drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c

+10 −7
Original line number Diff line number Diff line
@@ -1386,22 +1386,25 @@ static int rkisp1_register_capture(struct rkisp1_capture *cap) 


	vdev->queue = q;



	ret = media_entity_pads_init(&vdev->entity, 1, &node->pad);

	if (ret)

		return ret;



	ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);

	if (ret) {

		dev_err(cap->rkisp1->dev,

			"failed to register %s, ret=%d\n", vdev->name, ret);

		return ret;

		goto error;

	}



	v4l2_info(v4l2_dev, "registered %s as /dev/video%d\n", vdev->name,

		  vdev->num);



	ret = media_entity_pads_init(&vdev->entity, 1, &node->pad);

	if (ret) {

		video_unregister_device(vdev);

		return ret;

	}



	return 0;



error:

	media_entity_cleanup(&vdev->entity);

	return ret;

}



static void