diff options
| author | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 07:21:50 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 07:21:50 +0000 |
| commit | 6ae0a6e3c2e959d4b96c49e5d6aa475ed6932c43 (patch) | |
| tree | b35d197a144f4857ec29c2fd479721fd8d6677cb /drivers/of | |
| parent | 188eac302f18174c537f3142e103f75bcf9d8a6d (diff) | |
| parent | 4e9688ad3d36e8f73c73e435f53da5ae1cd91a70 (diff) | |
Merge tag 'v5.4.49' into 5.4-2.1.x-imx
This is the 5.4.49 stable release
Conflicts (manual resolve, NXP version taken):
sound/soc/fsl/fsl_esai.c
Commit 53057bd4ac84f upstream addresses the problem of endless isr in
case if exception interrupt is enabled and tasklet is scheduled. Since
NXP implementation has tasklet removed with commit 2bbe95fe6c0dd,
upstream fix does not match the main implementation, hence we keep the
NXP version here.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/kobj.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/of/kobj.c b/drivers/of/kobj.c index c72eef988041..a32e60b024b8 100644 --- a/drivers/of/kobj.c +++ b/drivers/of/kobj.c @@ -134,8 +134,6 @@ int __of_attach_node_sysfs(struct device_node *np) if (!name) return -ENOMEM; - of_node_get(np); - rc = kobject_add(&np->kobj, parent, "%s", name); kfree(name); if (rc) @@ -144,6 +142,7 @@ int __of_attach_node_sysfs(struct device_node *np) for_each_property_of_node(np, pp) __of_add_property_sysfs(np, pp); + of_node_get(np); return 0; } |