From: Srinivas Kandagatla <[email protected]> As part of of_platform_populate call, the existing code iterates each child node and then creates a platform device for each child, however there is bug in the code which does not check the match table before creating the platform device. This might result creating two platfrom devices and also invoking driver probe twice, which is incorrect.
This patch moves a existing of_match_node check to start of the function to fix the bug, doing this way will return immediately without creating any datastructures if the child does not match the supplied match-table. Signed-off-by: Srinivas Kandagatla <[email protected]> --- drivers/of/platform.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index b80891b..1aaa560 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -367,6 +367,9 @@ static int of_platform_bus_create(struct device_node *bus, return 0; } + if (!of_match_node(matches, bus)) + return 0; + auxdata = of_dev_lookup(lookup, bus); if (auxdata) { bus_id = auxdata->name; @@ -379,7 +382,7 @@ static int of_platform_bus_create(struct device_node *bus, } dev = of_platform_device_create_pdata(bus, bus_id, platform_data, parent); - if (!dev || !of_match_node(matches, bus)) + if (!dev) return 0; for_each_child_of_node(bus, child) { -- 1.7.0.4 _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
