Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d479386 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: omap3isp: Fix async notifier registration order 



The async notifier was registered before the v4l2_device was registered and
before the notifier callbacks were set. This could lead to missing the
bound() and complete() callbacks and to attempting to spin_lock() and
uninitialised spin lock.

Also fix unregistering the async notifier in the case of an error --- the
function may not fail anymore after the notifier is registered.

Fixes: da7f3843 ("[media] omap3isp: Add support for the Device Tree")

Signed-off-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Reviewed-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 9aee1ae3

drivers/media/platform/omap3isp/isp.c

+13 −10
Original line number Diff line number Diff line
@@ -2000,10 +2000,8 @@ static int isp_register_entities(struct isp_device *isp) 
	ret = v4l2_device_register_subdev_nodes(&isp->v4l2_dev);



done:

	if (ret < 0) {

	if (ret < 0)

		isp_unregister_entities(isp);

		v4l2_async_notifier_unregister(&isp->notifier);

	}



	return ret;

}
@@ -2423,10 +2421,6 @@ static int isp_probe(struct platform_device *pdev) 
		ret = isp_of_parse_nodes(&pdev->dev, &isp->notifier);

		if (ret < 0)

			return ret;

		ret = v4l2_async_notifier_register(&isp->v4l2_dev,

						   &isp->notifier);

		if (ret)

			return ret;

	} else {

		isp->pdata = pdev->dev.platform_data;

		isp->syscon = syscon_regmap_lookup_by_pdevname("syscon.0");
@@ -2557,18 +2551,27 @@ static int isp_probe(struct platform_device *pdev) 
	if (ret < 0)

		goto error_iommu;



	isp->notifier.bound = isp_subdev_notifier_bound;

	isp->notifier.complete = isp_subdev_notifier_complete;



	ret = isp_register_entities(isp);

	if (ret < 0)

		goto error_modules;



	if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) {

		isp->notifier.bound = isp_subdev_notifier_bound;

		isp->notifier.complete = isp_subdev_notifier_complete;



		ret = v4l2_async_notifier_register(&isp->v4l2_dev,

						   &isp->notifier);

		if (ret)

			goto error_register_entities;

	}



	isp_core_init(isp, 1);

	omap3isp_put(isp);



	return 0;



error_register_entities:

	isp_unregister_entities(isp);

error_modules:

	isp_cleanup_modules(isp);

error_iommu: