diff options
Diffstat (limited to 'drivers/acpi/acpica/evmisc.c')
-rw-r--r-- | drivers/acpi/acpica/evmisc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c index 417a9b920dd3..ce224e1eaa89 100644 --- a/drivers/acpi/acpica/evmisc.c +++ b/drivers/acpi/acpica/evmisc.c | |||
@@ -163,10 +163,10 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node, | |||
163 | * 2) Global device notify handler | 163 | * 2) Global device notify handler |
164 | * 3) Per-device notify handler | 164 | * 3) Per-device notify handler |
165 | */ | 165 | */ |
166 | if ((acpi_gbl_system_notify.handler | 166 | if ((acpi_gbl_system_notify.handler && |
167 | && (notify_value <= ACPI_MAX_SYS_NOTIFY)) | 167 | (notify_value <= ACPI_MAX_SYS_NOTIFY)) || |
168 | || (acpi_gbl_device_notify.handler | 168 | (acpi_gbl_device_notify.handler && |
169 | && (notify_value > ACPI_MAX_SYS_NOTIFY)) || handler_obj) { | 169 | (notify_value > ACPI_MAX_SYS_NOTIFY)) || handler_obj) { |
170 | notify_info = acpi_ut_create_generic_state(); | 170 | notify_info = acpi_ut_create_generic_state(); |
171 | if (!notify_info) { | 171 | if (!notify_info) { |
172 | return (AE_NO_MEMORY); | 172 | return (AE_NO_MEMORY); |
@@ -174,7 +174,8 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node, | |||
174 | 174 | ||
175 | if (!handler_obj) { | 175 | if (!handler_obj) { |
176 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 176 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
177 | "Executing system notify handler for Notify (%4.4s, %X) node %p\n", | 177 | "Executing system notify handler for Notify (%4.4s, %X) " |
178 | "node %p\n", | ||
178 | acpi_ut_get_node_name(node), | 179 | acpi_ut_get_node_name(node), |
179 | notify_value, node)); | 180 | notify_value, node)); |
180 | } | 181 | } |