On Sun June 23 2013 17:48:20 Prabhakar Lad wrote: > Hi Guennadi, > > Thanks for the review. > > On Sun, Jun 23, 2013 at 8:49 PM, Guennadi Liakhovetski > <g.liakhovetski@xxxxxx> wrote: > > On Sat, 22 Jun 2013, Prabhakar Lad wrote: > > > >> From: "Lad, Prabhakar" <prabhakar.csengg@xxxxxxxxx> > >> > >> Both synchronous and asynchronous tvp514x subdevice probing is supported by > >> this patch. > >> > >> Signed-off-by: Prabhakar Lad <prabhakar.csengg@xxxxxxxxx> > >> Cc: Guennadi Liakhovetski <g.liakhovetski@xxxxxx> > >> Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > >> Cc: Hans Verkuil <hverkuil@xxxxxxxxx> > >> Cc: Sakari Ailus <sakari.ailus@xxxxxx> > >> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> > >> --- > >> drivers/media/i2c/tvp514x.c | 22 +++++++++++++++------- > >> 1 file changed, 15 insertions(+), 7 deletions(-) > >> > >> diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c > >> index 864eb14..d090caf 100644 > >> --- a/drivers/media/i2c/tvp514x.c > >> +++ b/drivers/media/i2c/tvp514x.c > >> @@ -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> > > > > Ok, but this one really does too many things in one patch: > > > >> @@ -1148,9 +1149,9 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) > >> /* Register with V4L2 layer as slave device */ > >> sd = &decoder->sd; > >> v4l2_i2c_subdev_init(sd, client, &tvp514x_ops); > >> - strlcpy(sd->name, TVP514X_MODULE_NAME, sizeof(sd->name)); > >> > >> #if defined(CONFIG_MEDIA_CONTROLLER) > >> + strlcpy(sd->name, TVP514X_MODULE_NAME, sizeof(sd->name)); > > > > This is unrelated > > > OK I'll split the patch or may be a line in a commit message can do ? Please split it up in two patches. Why is sd->name set anyway? And why is it moved under CONFIG_MEDIA_CONTROLLER? It's not obvious to me. The remainder of the patch makes sense. Regards, Hans > > >> decoder->pad.flags = MEDIA_PAD_FL_SOURCE; > >> decoder->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; > >> decoder->sd.entity.flags |= MEDIA_ENT_T_V4L2_SUBDEV_DECODER; > >> @@ -1176,16 +1177,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); > > > > So is this - it wasn't called before in the "if (decoder->hdl.error)" case > > above. > > > Yes so fixed it up here. > > Regards, > --Prabhakar Lad > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html