[PATCH 1/1] UBUNTU: SAUCE: ACPI: EC: Limit workaround for ASUS notebooks even more

[Tim Gardner]

Andy Whitcroft wrote:
> From: Alexey Starikovskiy <astarikovskiy at suse.de>
> 
> Bug: #288385
> 
> References: http://bugzilla.kernel.org/show_bug.cgi?id=11884
> 
> Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
> Signed-off-by: Andy Whitcroft <apw at canonical.com>
> ---
>  drivers/acpi/ec.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
> index 566206a..0bbda06 100644
> --- a/drivers/acpi/ec.c
> +++ b/drivers/acpi/ec.c
> @@ -998,7 +998,7 @@ int __init acpi_ec_ecdt_probe(void)
>  	} else {
>  		/* This workaround is needed only on some broken machines,
>  		 * which require early EC, but fail to provide ECDT */
> -		acpi_handle x;
> +		acpi_handle dummy;
>  		printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
>  		status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
>  						boot_ec, NULL);
> @@ -1009,7 +1009,9 @@ int __init acpi_ec_ecdt_probe(void)
>  		 * which needs it, has fake EC._INI method, so use it as flag.
>  		 * Keep boot_ec struct as it will be needed soon.
>  		 */
> -		if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))
> +		if (!dmi_name_in_vendors("ASUS") ||
> +		    ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI",
> +						&dummy)))
>  			return -ENODEV;
>  	}
>  

ACK

-- 
Tim Gardner tim.gardner at canonical.com