hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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: da7f3843d2 ("[media] omap3isp: Add support for the Device Tree")

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Reviewed-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Sakari Ailus 2015-05-19 20:08:05 -03:00 committed by Mauro Carvalho Chehab
parent 9aee1ae331
commit 5d47938698
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/media/platform/omap3isp/isp.c
View File

@ -2000,10 +2000,8 @@ static int isp_register_entities(struct isp_device *isp)
ret = v4l2_device_register_subdev_nodes(&isp->v4l2_dev); ret = v4l2_device_register_subdev_nodes(&isp->v4l2_dev);
done: done:
if (ret < 0) { if (ret < 0)
isp_unregister_entities(isp); isp_unregister_entities(isp);
v4l2_async_notifier_unregister(&isp->notifier);
}
return ret; return ret;
} }
@ -2423,10 +2421,6 @@ static int isp_probe(struct platform_device *pdev)
ret = isp_of_parse_nodes(&pdev->dev, &isp->notifier); ret = isp_of_parse_nodes(&pdev->dev, &isp->notifier);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = v4l2_async_notifier_register(&isp->v4l2_dev,
&isp->notifier);
if (ret)
return ret;
} else { } else {
isp->pdata = pdev->dev.platform_data; isp->pdata = pdev->dev.platform_data;
isp->syscon = syscon_regmap_lookup_by_pdevname("syscon.0"); isp->syscon = syscon_regmap_lookup_by_pdevname("syscon.0");
@ -2557,18 +2551,27 @@ static int isp_probe(struct platform_device *pdev)
if (ret < 0) if (ret < 0)
goto error_iommu; goto error_iommu;
isp->notifier.bound = isp_subdev_notifier_bound;
isp->notifier.complete = isp_subdev_notifier_complete;
ret = isp_register_entities(isp); ret = isp_register_entities(isp);
if (ret < 0) if (ret < 0)
goto error_modules; 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); isp_core_init(isp, 1);
omap3isp_put(isp); omap3isp_put(isp);
return 0; return 0;
error_register_entities:
isp_unregister_entities(isp);
error_modules: error_modules:
isp_cleanup_modules(isp); isp_cleanup_modules(isp);
error_iommu: error_iommu: