Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7d97499 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mauro Carvalho Chehab
Browse files

[media] tvp5150: add support for asynchronous probing 



Allow the subdevice to be probed asynchronously.

Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent f5b5fbd3

drivers/media/i2c/tvp5150.c

+11 −3
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/videodev2.h>

#include <linux/delay.h>

#include <linux/module.h>

#include <media/v4l2-async.h>

#include <media/v4l2-device.h>

#include <media/tvp5150.h>

#include <media/v4l2-ctrls.h>
@@ -1172,8 +1173,7 @@ static int tvp5150_probe(struct i2c_client *c, 
	sd->ctrl_handler = &core->hdl;

	if (core->hdl.error) {

		res = core->hdl.error;

		v4l2_ctrl_handler_free(&core->hdl);

		return res;

		goto err;

	}

	v4l2_ctrl_handler_setup(&core->hdl);
@@ -1186,9 +1186,17 @@ static int tvp5150_probe(struct i2c_client *c, 
	core->rect.left = 0;

	core->rect.width = TVP5150_H_MAX;



	res = v4l2_async_register_subdev(sd);

	if (res < 0)

		goto err;



	if (debug > 1)

		tvp5150_log_status(sd);

	return 0;



err:

	v4l2_ctrl_handler_free(&core->hdl);

	return res;

}



static int tvp5150_remove(struct i2c_client *c)
@@ -1200,7 +1208,7 @@ static int tvp5150_remove(struct i2c_client *c) 
		"tvp5150.c: removing tvp5150 adapter on address 0x%x\n",

		c->addr << 1);



	v4l2_device_unregister_subdev(sd);

	v4l2_async_unregister_subdev(sd);

	v4l2_ctrl_handler_free(&decoder->hdl);

	return 0;

}