From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Sverdlin Subject: [PATCH v2] of/platform: Ignore disabled devices in of_platform_populate() Date: Mon, 23 Jan 2017 13:52:04 +0100 Message-ID: <20170123125204.22233-1-alexander.sverdlin@nokia.com> References: Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Alexander Sverdlin , Rob Herring , Frank Rowand , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: devicetree@vger.kernel.org Check the status property and give up early enough. Otherwise OF_POPULATED_BUS might be set for disabled bus which will prevent it from being populated later (if enabled). Signed-off-by: Alexander Sverdlin Cc: Rob Herring Cc: Frank Rowand Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org --- drivers/of/platform.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 35de1fc59fa6..060621d94f1a 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -476,6 +476,10 @@ int of_platform_populate(struct device_node *root, root = root ? of_node_get(root) : of_find_node_by_path("/"); if (!root) return -EINVAL; + if (!of_device_is_available(root)) { + of_node_put(root); + return 0; + } pr_debug("%s()\n", __func__); pr_debug(" starting at: %s\n", root->full_name); -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html