soc: imx: gpc: Do not pass static memory as platform data

Platform device core assumes the ownership of dev.platform_data as
well as that it is dynamically allocated and it will try to kfree it
as a part of platform_device_release(). Change the code to use
platform_device_add_data() instead of a pointer to a static memory to
avoid causing a BUG() when calling platform_device_put().

The problem can be reproduced by artificially enabling the error path
of platform_device_add() call (around line 452).

Cc: Stefan Agner <stefan@agner.ch>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c
index c4d35f32af8d704b021d1c992cd50629c34adc5d..32f0748fd0678fedc520b08b807590981d007154 100644 (file)
--- a/drivers/soc/imx/gpc.c
+++ b/drivers/soc/imx/gpc.c
@@ -443,17 +443,25 @@ static int imx_gpc_probe(struct platform_device *pdev)
                        if (domain_index >= of_id_data->num_domains)
                                continue;
 
-                       domain = &imx_gpc_domains[domain_index];
-                       domain->regmap = regmap;
-                       domain->ipg_rate_mhz = ipg_rate_mhz;
-
                        pd_pdev = platform_device_alloc("imx-pgc-power-domain",
                                                        domain_index);
                        if (!pd_pdev) {
                                of_node_put(np);
                                return -ENOMEM;
                        }
-                       pd_pdev->dev.platform_data = domain;
+
+                       ret = platform_device_add_data(pd_pdev,
+                                                      &imx_gpc_domains[domain_index],
+                                                      sizeof(imx_gpc_domains[domain_index]));
+                       if (ret) {
+                               platform_device_put(pd_pdev);
+                               of_node_put(np);
+                               return ret;
+                       }
+                       domain = pd_pdev->dev.platform_data;
+                       domain->regmap = regmap;
+                       domain->ipg_rate_mhz = ipg_rate_mhz;
+
                        pd_pdev->dev.parent = &pdev->dev;
                        pd_pdev->dev.of_node = np;