diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2020-10-09 08:55:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-10-09 08:55:17 +0200 |
| commit | e705d397965811ac528d7213b42d74ffe43caf38 (patch) | |
| tree | 8a5bbe85cc42e64992b97859976e307027f83e33 /lib/kobject.c | |
| parent | locking/atomics: Check atomic-arch-fallback.h too (diff) | |
| parent | lockdep: Revert "lockdep: Use raw_cpu_*() for per-cpu variables" (diff) | |
| download | wireguard-linux-e705d397965811ac528d7213b42d74ffe43caf38.tar.xz wireguard-linux-e705d397965811ac528d7213b42d74ffe43caf38.zip | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index 3afb939f2a1c..ea53b30cf483 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -604,9 +604,6 @@ static void __kobject_del(struct kobject *kobj) struct kernfs_node *sd; const struct kobj_type *ktype; - if (!kobj) - return; - sd = kobj->sd; ktype = get_ktype(kobj); @@ -637,8 +634,12 @@ static void __kobject_del(struct kobject *kobj) */ void kobject_del(struct kobject *kobj) { - struct kobject *parent = kobj->parent; + struct kobject *parent; + + if (!kobj) + return; + parent = kobj->parent; __kobject_del(kobj); kobject_put(parent); } |