|
@@ -36,6 +36,7 @@
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/v4l2-mediabus.h>
|
|
|
|
|
|
+#include <media/v4l2-async.h>
|
|
|
#include <media/v4l2-device.h>
|
|
|
#include <media/v4l2-common.h>
|
|
|
#include <media/v4l2-mediabus.h>
|
|
@@ -1175,16 +1176,22 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|
|
sd->ctrl_handler = &decoder->hdl;
|
|
|
if (decoder->hdl.error) {
|
|
|
ret = decoder->hdl.error;
|
|
|
-
|
|
|
- v4l2_ctrl_handler_free(&decoder->hdl);
|
|
|
- return ret;
|
|
|
+ goto done;
|
|
|
}
|
|
|
v4l2_ctrl_handler_setup(&decoder->hdl);
|
|
|
|
|
|
- v4l2_info(sd, "%s decoder driver registered !!\n", sd->name);
|
|
|
-
|
|
|
- return 0;
|
|
|
+ ret = v4l2_async_register_subdev(&decoder->sd);
|
|
|
+ if (!ret)
|
|
|
+ v4l2_info(sd, "%s decoder driver registered !!\n", sd->name);
|
|
|
|
|
|
+done:
|
|
|
+ if (ret < 0) {
|
|
|
+ v4l2_ctrl_handler_free(&decoder->hdl);
|
|
|
+#if defined(CONFIG_MEDIA_CONTROLLER)
|
|
|
+ media_entity_cleanup(&decoder->sd.entity);
|
|
|
+#endif
|
|
|
+ }
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1199,6 +1206,7 @@ static int tvp514x_remove(struct i2c_client *client)
|
|
|
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
|
|
struct tvp514x_decoder *decoder = to_decoder(sd);
|
|
|
|
|
|
+ v4l2_async_unregister_subdev(&decoder->sd);
|
|
|
v4l2_device_unregister_subdev(sd);
|
|
|
#if defined(CONFIG_MEDIA_CONTROLLER)
|
|
|
media_entity_cleanup(&decoder->sd.entity);
|