diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-30 02:51:01 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-30 02:51:01 -0500 |
| commit | 1ae22af7d750fbf665b7651fcbd3c15cc2d3793b (patch) | |
| tree | b1d7da8679c6730fdc98d531d544743f23d26c9f /drivers/platform/x86/hp-wmi.c | |
| parent | 27d0567ab635bc2af11be48f91c8d5a7a2dca2e4 (diff) | |
| parent | d1f9e4970742bb1e22d07b01bd44f9c357d25c42 (diff) | |
Merge branch 'wmi' into release
Diffstat (limited to 'drivers/platform/x86/hp-wmi.c')
| -rw-r--r-- | drivers/platform/x86/hp-wmi.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 8781d8fa7a5..5b648f0c607 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -338,8 +338,13 @@ static void hp_wmi_notify(u32 value, void *context) static struct key_entry *key; union acpi_object *obj; int eventcode; + acpi_status status; - wmi_get_event_data(value, &response); + status = wmi_get_event_data(value, &response); + if (status != AE_OK) { + printk(KERN_INFO "hp-wmi: bad event status 0x%x\n", status); + return; + } obj = (union acpi_object *)response.pointer; @@ -581,7 +586,7 @@ static int __init hp_wmi_init(void) if (wmi_has_guid(HPWMI_EVENT_GUID)) { err = wmi_install_notify_handler(HPWMI_EVENT_GUID, hp_wmi_notify, NULL); - if (!err) + if (ACPI_SUCCESS(err)) hp_wmi_input_setup(); } |