[Precise/Oneric SRU] ACPI / PM: Do not save/restore NVS on Asus K54C/K54HR

Colin Ian King colin.king at canonical.com
Wed Feb 29 09:10:20 UTC 2012


On 29/02/12 06:52, Keng-Yu Lin wrote:
> The models do not resume correctly without acpi_sleep=nonvs.
>
> Signed-off-by: Keng-Yu Lin<kengyu at canonical.com>
> Signed-off-by: Rafael J. Wysocki<rjw at sisk.pl>
> (cherry picked from commit 5a50a7c32d630d6cdb13d69afabb0cc81b2f379c)
>
> BugLink: http://bugs.launchpad.net/bugs/898503
>
> Signed-off-by: Keng-Yu Lin<kengyu at canonical.com>
> ---
>   drivers/acpi/sleep.c |   16 ++++++++++++++++
>   1 files changed, 16 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
> index 6d9a3ab..0a7ed69 100644
> --- a/drivers/acpi/sleep.c
> +++ b/drivers/acpi/sleep.c
> @@ -476,6 +476,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
>   		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"),
>   		},
>   	},
> +	{
> +	.callback = init_nvs_nosave,
> +	.ident = "Asus K54C",
> +	.matches = {
> +		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
> +		DMI_MATCH(DMI_PRODUCT_NAME, "K54C"),
> +		},
> +	},
> +	{
> +	.callback = init_nvs_nosave,
> +	.ident = "Asus K54HR",
> +	.matches = {
> +		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
> +		DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),
> +		},
> +	},
>   	{},
>   };
>   #endif /* CONFIG_SUSPEND */

Looks OK to me, and affects limited set of machines and is upstream and 
has been tested, so..

Acked-by: Colin Ian King <colin.king at canonical.com>



More information about the kernel-team mailing list