[PATCH 2/5] Solve conflict I missed.
From: Pavel
Date: Fri Apr 29 2016 - 06:02:07 EST
---
drivers/media/platform/omap3isp/isp.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 9f51127..7419404 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2392,18 +2392,14 @@ static int isp_probe(struct platform_device *pdev)
if (ret < 0)
goto error_modules;
-<<<<<<< HEAD
ret = isp_create_links(isp);
if (ret < 0)
goto error_register_entities;
- 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;
-=======
+
if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) {
isp->notifier.bound = isp_subdev_notifier_bound;
isp->notifier.complete = isp_subdev_notifier_complete;
@@ -2413,7 +2409,6 @@ static int isp_probe(struct platform_device *pdev)
if (ret)
goto error_register_entities;
}
->>>>>>> a035633... omap3isp: Fix async notifier registration order
isp_core_init(isp, 1);
omap3isp_put(isp);
--
2.1.4
--azLHFNyN32YCQGCU
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0003-Cherry-pick-manually.patch"