diff options
| author | Pantelis Antoniou <pantelis.antoniou@konsulko.com> | 2014-12-16 19:45:26 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2015-01-22 15:36:55 +0000 |
| commit | 15204ab1ebc5aba608cd19c83c37b98438b938b0 (patch) | |
| tree | c93f585003ba718061cbe066379206a3c1e761fc | |
| parent | 3e7f7626fd49a9ffba8520a1a073f62929acad63 (diff) | |
| download | op-kernel-dev-15204ab1ebc5aba608cd19c83c37b98438b938b0.zip op-kernel-dev-15204ab1ebc5aba608cd19c83c37b98438b938b0.tar.gz | |
of/platform: Handle of_populate drivers in notifier
When using overlays with drivers calling of_populate the notifier
will try to create the device twice. Using the populated bit
before proceeding protects against this.
Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
| -rw-r--r-- | drivers/of/platform.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index a54ec10..b0d50d7 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -566,6 +566,10 @@ static int of_platform_notify(struct notifier_block *nb, if (!of_node_check_flag(rd->dn->parent, OF_POPULATED_BUS)) return NOTIFY_OK; /* not for us */ + /* already populated? (driver using of_populate manually) */ + if (of_node_check_flag(rd->dn, OF_POPULATED)) + return NOTIFY_OK; + /* pdev_parent may be NULL when no bus platform device */ pdev_parent = of_find_device_by_node(rd->dn->parent); pdev = of_platform_device_create(rd->dn, NULL, @@ -581,6 +585,11 @@ static int of_platform_notify(struct notifier_block *nb, break; case OF_RECONFIG_CHANGE_REMOVE: + + /* already depopulated? */ + if (!of_node_check_flag(rd->dn, OF_POPULATED)) + return NOTIFY_OK; + /* find our device by node */ pdev = of_find_device_by_node(rd->dn); if (pdev == NULL) |
