media: max9286: Free control handler

pinchartl · gregkh · commit 19f36204dbe2 · 2023-05-11T23:17:02.000+09:00
[ Upstream commit bfce6a1 ] The control handler is leaked in some probe-time error paths, as well as in the remove path. Fix it. Fixes: 66d8c9d ("media: i2c: Add MAX9286 driver") Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c
@@ -1122,6 +1122,7 @@ static int max9286_v4l2_register(struct max9286_priv *priv)
 static void max9286_v4l2_unregister(struct max9286_priv *priv)
 {
 	fwnode_handle_put(priv->sd.fwnode);
+	v4l2_ctrl_handler_free(&priv->ctrls);
 	v4l2_async_unregister_subdev(&priv->sd);
 	max9286_v4l2_notifier_unregister(priv);
 }

Original file line number	Diff line number	Diff line change
`@@ -1122,6 +1122,7 @@ static int max9286_v4l2_register(struct max9286_priv *priv)`
`1122`	`1122`	`static void max9286_v4l2_unregister(struct max9286_priv *priv)`
`1123`	`1123`	`{`
`1124`	`1124`	`fwnode_handle_put(priv->sd.fwnode);`
	`1125`	`+ v4l2_ctrl_handler_free(&priv->ctrls);`
`1125`	`1126`	`v4l2_async_unregister_subdev(&priv->sd);`
`1126`	`1127`	`max9286_v4l2_notifier_unregister(priv);`
`1127`	`1128`	`}`