Commit 7c21b38c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents 93d68841 0224a4a3

drivers/base/property.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


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)

include/acpi/acpi_bus.h

+2 −2
Original line number Diff line number Diff line
@@ -394,13 +394,13 @@ struct acpi_data_node { 


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);

}



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)

include/linux/of.h

+1 −1
Original line number Diff line number Diff line
@@ -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)