Merge branch 'device-properties'

[firefly-linux-kernel-4.4.55.git] / include / acpi / acpi_bus.h

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index f8009d99190a04bce3801218db1fecd8e29382f7..8de4fa90e8c4add33967c8dbec6b7cfe2d01b2c4 100644 (file)
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -387,7 +387,8 @@ static inline bool is_acpi_node(struct fwnode_handle *fwnode)
 
 static inline struct acpi_device *acpi_node(struct fwnode_handle *fwnode)
 {
-       return fwnode ? container_of(fwnode, struct acpi_device, fwnode) : NULL;
+       return is_acpi_node(fwnode) ?
+               container_of(fwnode, struct acpi_device, fwnode) : NULL;
 }
 
 static inline struct fwnode_handle *acpi_fwnode_handle(struct acpi_device *adev)