[media] media: i2c: adv7343: add support for asynchronous probing
authorLad, Prabhakar <prabhakar.csengg@gmail.com>
Sat, 22 Jun 2013 09:07:37 +0000 (06:07 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Fri, 26 Jul 2013 16:15:18 +0000 (13:15 -0300)
Both synchronous and asynchronous adv7343 subdevice probing is supported by
this patch.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/i2c/adv7343.c

index 7606218ec4a760bb14bd5fcfbe0813e480f89466..8080c2cf1029221b13bdd61c844588b360c6204a 100644 (file)
@@ -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-ctrls.h>
 
@@ -445,16 +446,21 @@ 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;
+
+       err = v4l2_async_register_subdev(&state->sd);
+
+done:
+       if (err < 0)
                v4l2_ctrl_handler_free(&state->hdl);
+
        return err;
 }
 
@@ -463,6 +469,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);