On 04/15/2015 10:08 PM, Guennadi Liakhovetski wrote: > On Thu, 9 Apr 2015, Hans Verkuil wrote: > >> From: Hans Verkuil <hans.verk...@cisco.com> >> >> Replace all calls to the enum_mbus_fmt video op by the pad >> enum_mbus_code op and remove the duplicate video op. >> >> Signed-off-by: Hans Verkuil <hans.verk...@cisco.com> >> Cc: Guennadi Liakhovetski <g.liakhovet...@gmx.de> >> Cc: Scott Jiang <scott.jiang.li...@gmail.com> >> Cc: Jonathan Corbet <cor...@lwn.net> >> Cc: Kamil Debski <k.deb...@samsung.com> >> --- > > [snip] > >> diff --git a/drivers/media/i2c/soc_camera/mt9m111.c >> b/drivers/media/i2c/soc_camera/mt9m111.c >> index 441e0fd..ef8682c 100644 >> --- a/drivers/media/i2c/soc_camera/mt9m111.c >> +++ b/drivers/media/i2c/soc_camera/mt9m111.c >> @@ -839,13 +839,14 @@ static struct v4l2_subdev_core_ops >> mt9m111_subdev_core_ops = { >> #endif >> }; >> >> -static int mt9m111_enum_fmt(struct v4l2_subdev *sd, unsigned int index, >> - u32 *code) >> +static int mt9m111_enum_mbus_code(struct v4l2_subdev *sd, >> + struct v4l2_subdev_pad_config *cfg, >> + struct v4l2_subdev_mbus_code_enum *code) >> { >> - if (index >= ARRAY_SIZE(mt9m111_colour_fmts)) >> + if (code->code || code->index >= ARRAY_SIZE(mt9m111_colour_fmts)) > > Didn't you mean > > + if (code->pad || code->index >= ARRAY_SIZE(mt9m111_colour_fmts)) > > ?
Nice catch! Thanks, I've fixed this. Regards, Hans -- 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