On Thursday 26 August 2010 08:14:42 Dmitry Torokhov wrote:
> Driver initialization was forgetting to remove EC address space handler
> in cases when parse_wdg() method failed.
>
> Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
Acked-by: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
> ---
>
> drivers/platform/x86/wmi.c | 9 +++++++--
> 1 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
> index b2978a0..7a77f03 100644
> --- a/drivers/platform/x86/wmi.c
> +++ b/drivers/platform/x86/wmi.c
> @@ -968,12 +968,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;
> }
--
E-Mail: carlos@xxxxxxxxxxxxxxxxxxx
Web: strangeworlds.co.uk
GPG Key ID: 0x23EE722D
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
