[PATCH 4.2 072/134] [media] v4l: omap3isp: Fix async notifier registration order

[Greg Kroah-Hartman]

4.2-stable review patch.  If anyone has any objections, please let me know.

--

From: Sakari Ailus 

commit 5d479386983c5f1bb1aff4f88a027b6143f88a39 upstream.

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

Signed-off-by: Sakari Ailus 
Reviewed-by: Sebastian Reichel 
Signed-off-by: Laurent Pinchart 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/media/platform/omap3isp/isp.c |   23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2000,10 +2000,8 @@ static int isp_register_entities(struct
ret = v4l2_device_register_subdev_nodes(>v4l2_dev);
 
 done:
-   if (ret < 0) {
+   if (ret < 0)
isp_unregister_entities(isp);
-   v4l2_async_notifier_unregister(>notifier);
-   }
 
return ret;
 }
@@ -2423,10 +2421,6 @@ static int isp_probe(struct platform_dev
ret = isp_of_parse_nodes(>dev, >notifier);
if (ret < 0)
return ret;
-   ret = v4l2_async_notifier_register(>v4l2_dev,
-  >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_dev
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(>v4l2_dev,
+  >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:


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 4.2 072/134] [media] v4l: omap3isp: Fix async notifier registration order

[Greg Kroah-Hartman]

4.2-stable review patch.  If anyone has any objections, please let me know.

--

From: Sakari Ailus 

commit 5d479386983c5f1bb1aff4f88a027b6143f88a39 upstream.

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

Signed-off-by: Sakari Ailus 
Reviewed-by: Sebastian Reichel 
Signed-off-by: Laurent Pinchart 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/media/platform/omap3isp/isp.c |   23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2000,10 +2000,8 @@ static int isp_register_entities(struct
ret = v4l2_device_register_subdev_nodes(>v4l2_dev);
 
 done:
-   if (ret < 0) {
+   if (ret < 0)
isp_unregister_entities(isp);
-   v4l2_async_notifier_unregister(>notifier);
-   }
 
return ret;
 }
@@ -2423,10 +2421,6 @@ static int isp_probe(struct platform_dev
ret = isp_of_parse_nodes(>dev, >notifier);
if (ret < 0)
return ret;
-   ret = v4l2_async_notifier_register(>v4l2_dev,
-  >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_dev
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(>v4l2_dev,
+  >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:


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/