Commit 9863bc86 authored Jun 12, 2018 by Jacopo Mondi Committed by Mauro Carvalho Chehab Jul 04, 2018

media: rcar-vin: Cleanup notifier in error path



During the notifier initialization, memory for the list of associated async
subdevices is reserved during the fwnode endpoint parsing from the v4l2-async
framework. If the notifier registration fails, that memory should be released
and the notifier 'cleaned up'.

Catch the notifier registration error and perform the cleanup both for the
group and the parallel notifiers.

Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Acked-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

parent 2241ea75

drivers/media/platform/rcar-vin/rcar-core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -571,6 +571,7 @@ static int rvin_parallel_graph_init(struct rvin_dev *vin)
		ret = v4l2_async_notifier_register(&vin->v4l2_dev, &vin->notifier);
		if (ret < 0) {
		vin_err(vin, "Notifier registration failed\n");
		v4l2_async_notifier_cleanup(&vin->group->notifier);
		return ret;
		}

		@@ -773,6 +774,7 @@ static int rvin_mc_parse_of_graph(struct rvin_dev *vin)
		&vin->group->notifier);
		if (ret < 0) {
		vin_err(vin, "Notifier registration failed\n");
		v4l2_async_notifier_cleanup(&vin->group->notifier);
		return ret;
		}