diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
| commit | 4ba24fef3eb3b142197135223b90ced2f319cd53 (patch) | |
| tree | a20c125b27740ec7b4c761b11d801108e1b316b2 /lib/kobject.c | |
| parent | 47c1ffb2b6b630894e9a16442611c056ab21c057 (diff) | |
| parent | 98a4a59ee31a12105a2b84f5b8b515ac2cb208ef (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.20.
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index 58751bb80a7c..03d4ab349fa7 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
| @@ -976,7 +976,7 @@ const struct kobj_ns_type_operations *kobj_child_ns_ops(struct kobject *parent) | |||
| 976 | { | 976 | { |
| 977 | const struct kobj_ns_type_operations *ops = NULL; | 977 | const struct kobj_ns_type_operations *ops = NULL; |
| 978 | 978 | ||
| 979 | if (parent && parent->ktype->child_ns_type) | 979 | if (parent && parent->ktype && parent->ktype->child_ns_type) |
| 980 | ops = parent->ktype->child_ns_type(parent); | 980 | ops = parent->ktype->child_ns_type(parent); |
| 981 | 981 | ||
| 982 | return ops; | 982 | return ops; |