diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-07 07:00:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-07 07:00:07 +0200 |
| commit | 35dc9ec1076b79c31bf7ed538af008b7f23bb14d (patch) | |
| tree | f90affdd5dc45f47f8d5d84ea34c71e5e521e7a1 /include/linux/of.h | |
| parent | 0ec7ae928a9c19c2b7b8054507d5694a2597065e (diff) | |
| parent | 07837831047fb72856d1f61a726a4094397facd8 (diff) | |
Merge branch 'linus' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/of.h')
| -rw-r--r-- | include/linux/of.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 7fcb681baadf..31758036787c 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -133,7 +133,7 @@ void of_core_init(void); static inline bool is_of_node(struct fwnode_handle *fwnode) { - return fwnode && fwnode->type == FWNODE_OF; + return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_OF; } static inline struct device_node *to_of_node(struct fwnode_handle *fwnode) |