On Sat June 22 2013 19:44:14 Prabhakar Lad wrote:
> From: "Lad, Prabhakar" <prabhakar.cse...@gmail.com>
> 
> Both synchronous and asynchronous tvp7002 subdevice probing
> is supported by this patch.

Can I merge this patch without patch 2/2? Or should I wait with both until
the video sync properties have been approved?

        Hans

> 
> Signed-off-by: Lad, Prabhakar <prabhakar.cse...@gmail.com>
> Cc: Hans Verkuil <hans.verk...@cisco.com>
> Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
> Cc: Mauro Carvalho Chehab <mche...@redhat.com>
> Cc: Guennadi Liakhovetski <g.liakhovet...@gmx.de>
> Cc: Sylwester Nawrocki <s.nawro...@samsung.com>
> Cc: Sakari Ailus <sakari.ai...@iki.fi>
> Cc: linux-ker...@vger.kernel.org
> Cc: davinci-linux-open-sou...@linux.davincidsp.com
> ---
>  drivers/media/i2c/tvp7002.c |    6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c
> index 36ad565..b577548 100644
> --- a/drivers/media/i2c/tvp7002.c
> +++ b/drivers/media/i2c/tvp7002.c
> @@ -31,6 +31,7 @@
>  #include <linux/module.h>
>  #include <linux/v4l2-dv-timings.h>
>  #include <media/tvp7002.h>
> +#include <media/v4l2-async.h>
>  #include <media/v4l2-device.h>
>  #include <media/v4l2-common.h>
>  #include <media/v4l2-ctrls.h>
> @@ -1040,6 +1041,10 @@ static int tvp7002_probe(struct i2c_client *c, const 
> struct i2c_device_id *id)
>       }
>       v4l2_ctrl_handler_setup(&device->hdl);
>  
> +     error = v4l2_async_register_subdev(&device->sd);
> +     if (error)
> +             goto error;
> +
>       return 0;
>  
>  error:
> @@ -1064,6 +1069,7 @@ static int tvp7002_remove(struct i2c_client *c)
>  
>       v4l2_dbg(1, debug, sd, "Removing tvp7002 adapter"
>                               "on address 0x%x\n", c->addr);
> +     v4l2_async_unregister_subdev(&device->sd);
>  #if defined(CONFIG_MEDIA_CONTROLLER)
>       media_entity_cleanup(&device->sd.entity);
>  #endif
> 
--
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