From: Lad, Prabhakar <prabhakar.cse...@gmail.com>

Both synchronous and asynchronous adv7343 subdevice probing is supported by
this patch.

Signed-off-by: Lad, Prabhakar <prabhakar.cse...@gmail.com>
Cc: Guennadi Liakhovetski <g.liakhovet...@gmx.de>
Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Cc: Hans Verkuil <hverk...@xs4all.nl>
Cc: Sakari Ailus <sakari.ai...@iki.fi>
Cc: Mauro Carvalho Chehab <mche...@redhat.com>
---
 drivers/media/i2c/adv7343.c |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/media/i2c/adv7343.c b/drivers/media/i2c/adv7343.c
index 9fc2b98..5b1417b 100644
--- a/drivers/media/i2c/adv7343.c
+++ b/drivers/media/i2c/adv7343.c
@@ -27,6 +27,7 @@
 #include <linux/uaccess.h>
 
 #include <media/adv7343.h>
+#include <media/v4l2-async.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-ctrls.h>
@@ -44,6 +45,7 @@ struct adv7343_state {
        struct v4l2_subdev sd;
        struct v4l2_ctrl_handler hdl;
        const struct adv7343_platform_data *pdata;
+       struct v4l2_async_subdev_list   asdl;
        u8 reg00;
        u8 reg01;
        u8 reg02;
@@ -455,16 +457,22 @@ static int adv7343_probe(struct i2c_client *client,
                                       ADV7343_GAIN_DEF);
        state->sd.ctrl_handler = &state->hdl;
        if (state->hdl.error) {
-               int err = state->hdl.error;
-
-               v4l2_ctrl_handler_free(&state->hdl);
-               return err;
+               err = state->hdl.error;
+               goto done;
        }
        v4l2_ctrl_handler_setup(&state->hdl);
 
        err = adv7343_initialize(&state->sd);
        if (err)
+               goto done;
+
+       state->sd.dev = &client->dev;
+       err = v4l2_async_register_subdev(&state->sd);
+
+done:
+       if (err < 0)
                v4l2_ctrl_handler_free(&state->hdl);
+
        return err;
 }
 
@@ -473,6 +481,7 @@ static int adv7343_remove(struct i2c_client *client)
        struct v4l2_subdev *sd = i2c_get_clientdata(client);
        struct adv7343_state *state = to_state(sd);
 
+       v4l2_async_unregister_subdev(&state->sd);
        v4l2_device_unregister_subdev(sd);
        v4l2_ctrl_handler_free(&state->hdl);
 
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to