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

[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
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/module.h> #include <linux/module.h>
#include <media/v4l2-async.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/tvp5150.h> #include <media/tvp5150.h>
#include <media/v4l2-ctrls.h> #include <media/v4l2-ctrls.h>
...@@ -1172,8 +1173,7 @@ static int tvp5150_probe(struct i2c_client *c, ...@@ -1172,8 +1173,7 @@ static int tvp5150_probe(struct i2c_client *c,
sd->ctrl_handler = &core->hdl; sd->ctrl_handler = &core->hdl;
if (core->hdl.error) { if (core->hdl.error) {
res = core->hdl.error; res = core->hdl.error;
v4l2_ctrl_handler_free(&core->hdl); goto err;
return res;
} }
v4l2_ctrl_handler_setup(&core->hdl); v4l2_ctrl_handler_setup(&core->hdl);
...@@ -1186,9 +1186,17 @@ static int tvp5150_probe(struct i2c_client *c, ...@@ -1186,9 +1186,17 @@ static int tvp5150_probe(struct i2c_client *c,
core->rect.left = 0; core->rect.left = 0;
core->rect.width = TVP5150_H_MAX; core->rect.width = TVP5150_H_MAX;
res = v4l2_async_register_subdev(sd);
if (res < 0)
goto err;
if (debug > 1) if (debug > 1)
tvp5150_log_status(sd); tvp5150_log_status(sd);
return 0; return 0;
err:
v4l2_ctrl_handler_free(&core->hdl);
return res;
} }
static int tvp5150_remove(struct i2c_client *c) static int tvp5150_remove(struct i2c_client *c)
...@@ -1200,7 +1208,7 @@ 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", "tvp5150.c: removing tvp5150 adapter on address 0x%x\n",
c->addr << 1); c->addr << 1);
v4l2_device_unregister_subdev(sd); v4l2_async_unregister_subdev(sd);
v4l2_ctrl_handler_free(&decoder->hdl); v4l2_ctrl_handler_free(&decoder->hdl);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment