Commit d94a26f0 authored by Wenyou Yang's avatar Wenyou Yang Committed by Mauro Carvalho Chehab
Browse files

media: ov7670: Add entity pads initialization 



Add the media entity pads initialization.

Signed-off-by: default avatarWenyou Yang <wenyou.yang@microchip.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 9d2d6068

drivers/media/i2c/ov7670.c

+20 −1
Original line number Diff line number Diff line
@@ -213,6 +213,9 @@ struct ov7670_devtype { 
struct ov7670_format_struct;  /* coming later */

struct ov7670_info {

	struct v4l2_subdev sd;

#if defined(CONFIG_MEDIA_CONTROLLER)

	struct media_pad pad;

#endif

	struct v4l2_ctrl_handler hdl;

	struct {

		/* gain cluster */
@@ -1688,14 +1691,27 @@ static int ov7670_probe(struct i2c_client *client, 
	v4l2_ctrl_auto_cluster(2, &info->auto_exposure,

			       V4L2_EXPOSURE_MANUAL, false);

	v4l2_ctrl_cluster(2, &info->saturation);



#if defined(CONFIG_MEDIA_CONTROLLER)

	info->pad.flags = MEDIA_PAD_FL_SOURCE;

	info->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;

	ret = media_entity_pads_init(&info->sd.entity, 1, &info->pad);

	if (ret < 0)

		goto hdl_free;

#endif



	v4l2_ctrl_handler_setup(&info->hdl);



	ret = v4l2_async_register_subdev(&info->sd);

	if (ret < 0)

		goto hdl_free;

		goto entity_cleanup;



	return 0;



entity_cleanup:

#if defined(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&info->sd.entity);

#endif

hdl_free:

	v4l2_ctrl_handler_free(&info->hdl);

clk_disable:
@@ -1712,6 +1728,9 @@ static int ov7670_remove(struct i2c_client *client) 
	v4l2_device_unregister_subdev(sd);

	v4l2_ctrl_handler_free(&info->hdl);

	clk_disable_unprepare(info->clk);

#if defined(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&info->sd.entity);

#endif

	return 0;

}