github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 19:13:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branches 'acpica-fixes' and 'device-properties-fixes'

Browse Source 
* 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:
Rafael J. Wysocki 2016-05-06 13:15:52 +02:00
commit 7c21b38ca9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/property.c
View File

@ -21,7 +21,7 @@
static inline bool is_pset_node(struct fwnode_handle *fwnode) static inline bool is_pset_node(struct fwnode_handle *fwnode)
{ {
return fwnode && fwnode->type == FWNODE_PDATA; return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_PDATA;
} }
static inline struct property_set *to_pset_node(struct fwnode_handle *fwnode) static inline struct property_set *to_pset_node(struct fwnode_handle *fwnode)

4
include/acpi/acpi_bus.h
View File

@ -394,13 +394,13 @@ struct acpi_data_node {
static inline bool is_acpi_node(struct fwnode_handle *fwnode) static inline bool is_acpi_node(struct fwnode_handle *fwnode)
{ {
return fwnode && (fwnode->type == FWNODE_ACPI return !IS_ERR_OR_NULL(fwnode) && (fwnode->type == FWNODE_ACPI
|| fwnode->type == FWNODE_ACPI_DATA); || fwnode->type == FWNODE_ACPI_DATA);
} }
static inline bool is_acpi_device_node(struct fwnode_handle *fwnode) static inline bool is_acpi_device_node(struct fwnode_handle *fwnode)
{ {
return fwnode && fwnode->type == FWNODE_ACPI; return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_ACPI;
} }
static inline struct acpi_device *to_acpi_device_node(struct fwnode_handle *fwnode) static inline struct acpi_device *to_acpi_device_node(struct fwnode_handle *fwnode)

2
include/linux/of.h
View File

@ -133,7 +133,7 @@ void of_core_init(void);
static inline bool is_of_node(struct fwnode_handle *fwnode) 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) static inline struct device_node *to_of_node(struct fwnode_handle *fwnode)