summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-08-26 11:14:42 +0400
committerMatthew Garrett <mjg@redhat.com>2010-10-21 17:36:46 +0400
commit5212cd678af82fef00f6d60d14de01c1211aad56 (patch)
tree8d19ceef8de9e4ac568cc498b2dc47245eb2ce08 /drivers/platform
parentac9b1e5b63d5d9829ecf2294f0486ccd270c5db4 (diff)
downloadlinux-5212cd678af82fef00f6d60d14de01c1211aad56.tar.xz
WMI: remove EC region handler when _WDG parsing fails
Driver initialization was forgetting to remove EC address space handler in cases when parse_wdg() method failed. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/wmi.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 49806824a463..63d0b65deffb 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -956,12 +956,17 @@ static int acpi_wmi_add(struct acpi_device *device)
ACPI_ADR_SPACE_EC,
&acpi_wmi_ec_space_handler,
NULL, NULL);
- if (ACPI_FAILURE(status))
+ if (ACPI_FAILURE(status)) {
+ printk(KERN_ERR PREFIX "Error installing EC region handler\n");
return -ENODEV;
+ }
status = parse_wdg(device->handle);
if (ACPI_FAILURE(status)) {
- printk(KERN_ERR PREFIX "Error installing EC region handler\n");
+ acpi_remove_address_space_handler(device->handle,
+ ACPI_ADR_SPACE_EC,
+ &acpi_wmi_ec_space_handler);
+ printk(KERN_ERR PREFIX "Failed to parse WDG method\n");
return -ENODEV;
}