| Message ID | 1b238cd98e03909bc4955113ffbe7e0c9f0db4f8.1311753459.git.andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
On Wed, Jul 27, 2011 at 10:58:02AM +0300, Andy Shevchenko wrote: > Potentially the adp1653_init_controls could return an error. In our case the > error was ignored, meanwhile it means incorrect initialization of V4L2 > controls. Hi, Andy! Many thanks for the another patch! I'll add this to my next pull req as well. Just FYI: As this is clearly a regular patch for the V4L2 subsystem, I think cc'ing the linux-kernel list isn't necessary. > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Mauro Carvalho Chehab <mchehab@infradead.org> > Cc: Sakari Ailus <sakari.ailus@iki.fi> > --- > drivers/media/video/adp1653.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/drivers/media/video/adp1653.c b/drivers/media/video/adp1653.c > index 8ad89ff..3379e6d 100644 > --- a/drivers/media/video/adp1653.c > +++ b/drivers/media/video/adp1653.c > @@ -429,7 +429,11 @@ static int adp1653_probe(struct i2c_client *client, > flash->subdev.internal_ops = &adp1653_internal_ops; > flash->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; > > - adp1653_init_controls(flash); > + ret = adp1653_init_controls(flash); > + if (ret) { > + kfree(flash); > + return ret; > + } > > ret = media_entity_init(&flash->subdev.entity, 0, NULL, 0); > if (ret < 0) > -- > 1.7.5.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Cheers,
On Wed, 2011-07-27 at 11:15 +0300, Sakari Ailus wrote: > On Wed, Jul 27, 2011 at 10:58:02AM +0300, Andy Shevchenko wrote: > > Potentially the adp1653_init_controls could return an error. In our case the > > error was ignored, meanwhile it means incorrect initialization of V4L2 > > controls. > > Hi, Andy! > > Many thanks for the another patch! I'll add this to my next pull req as > well. Please, skip this version, I will send updated one. > Just FYI: As this is clearly a regular patch for the V4L2 subsystem, I think > cc'ing the linux-kernel list isn't necessary. Sure.
diff --git a/drivers/media/video/adp1653.c b/drivers/media/video/adp1653.c index 8ad89ff..3379e6d 100644 --- a/drivers/media/video/adp1653.c +++ b/drivers/media/video/adp1653.c @@ -429,7 +429,11 @@ static int adp1653_probe(struct i2c_client *client, flash->subdev.internal_ops = &adp1653_internal_ops; flash->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; - adp1653_init_controls(flash); + ret = adp1653_init_controls(flash); + if (ret) { + kfree(flash); + return ret; + } ret = media_entity_init(&flash->subdev.entity, 0, NULL, 0); if (ret < 0)
Potentially the adp1653_init_controls could return an error. In our case the error was ignored, meanwhile it means incorrect initialization of V4L2 controls. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: Sakari Ailus <sakari.ailus@iki.fi> --- drivers/media/video/adp1653.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)