diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /drivers/acpi/acpi_memhotplug.c | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/acpi/acpi_memhotplug.c')
| -rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index b0d4b147b19e..1dda370f402b 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
| @@ -484,10 +484,8 @@ acpi_memory_register_notify_handler(acpi_handle handle, | |||
| 484 | 484 | ||
| 485 | 485 | ||
| 486 | status = is_memory_device(handle); | 486 | status = is_memory_device(handle); |
| 487 | if (ACPI_FAILURE(status)){ | 487 | if (ACPI_FAILURE(status)) |
| 488 | ACPI_EXCEPTION((AE_INFO, status, "handle is no memory device")); | ||
| 489 | return AE_OK; /* continue */ | 488 | return AE_OK; /* continue */ |
| 490 | } | ||
| 491 | 489 | ||
| 492 | status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY, | 490 | status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY, |
| 493 | acpi_memory_device_notify, NULL); | 491 | acpi_memory_device_notify, NULL); |
| @@ -503,10 +501,8 @@ acpi_memory_deregister_notify_handler(acpi_handle handle, | |||
| 503 | 501 | ||
| 504 | 502 | ||
| 505 | status = is_memory_device(handle); | 503 | status = is_memory_device(handle); |
| 506 | if (ACPI_FAILURE(status)){ | 504 | if (ACPI_FAILURE(status)) |
| 507 | ACPI_EXCEPTION((AE_INFO, status, "handle is no memory device")); | ||
| 508 | return AE_OK; /* continue */ | 505 | return AE_OK; /* continue */ |
| 509 | } | ||
| 510 | 506 | ||
| 511 | status = acpi_remove_notify_handler(handle, | 507 | status = acpi_remove_notify_handler(handle, |
| 512 | ACPI_SYSTEM_NOTIFY, | 508 | ACPI_SYSTEM_NOTIFY, |