Merge branches 'acpica-fixes' and 'device-properties-fixes'
* acpica-fixes: ACPICA: Dispatcher: Update thread ID for recursive method calls * device-properties-fixes: device property: Avoid potential dereferences of invalid pointers
This commit is contained in:
commit
7c21b38ca9
3 changed files with 4 additions and 4 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue