Skip to content

Commit e20117a

Browse files
Dan Carpentergregkh
authored andcommitted
media: i2c: max96717: clean up on error in max96717_subdev_init()
[ Upstream commit d567869 ] Call v4l2_ctrl_handler_free() to clean up from v4l2_ctrl_handler_init(). Fixes: 19b5e55 ("media: i2c: max96717: add test pattern ctrl") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Julien Massot <julien.massot@collabora.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 30e42ac commit e20117a

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/media/i2c/max96717.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -697,8 +697,10 @@ static int max96717_subdev_init(struct max96717_priv *priv)
697697
priv->pads[MAX96717_PAD_SOURCE].flags = MEDIA_PAD_FL_SOURCE;
698698

699699
ret = media_entity_pads_init(&priv->sd.entity, 2, priv->pads);
700-
if (ret)
701-
return dev_err_probe(dev, ret, "Failed to init pads\n");
700+
if (ret) {
701+
dev_err_probe(dev, ret, "Failed to init pads\n");
702+
goto err_free_ctrl;
703+
}
702704

703705
ret = v4l2_subdev_init_finalize(&priv->sd);
704706
if (ret) {

0 commit comments

Comments
 (0)