| Message ID | 1330498345-22077-2-git-send-email-kengyu@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 29.02.2012 07:52, Keng-Yu Lin wrote: > The models do not resume correctly without acpi_sleep=nonvs. > > Signed-off-by: Keng-Yu Lin<kengyu@canonical.com> > Signed-off-by: Rafael J. Wysocki<rjw@sisk.pl> > (cherry picked from commit 5a50a7c32d630d6cdb13d69afabb0cc81b2f379c) > > BugLink: http://bugs.launchpad.net/bugs/898503 > > Signed-off-by: Keng-Yu Lin<kengyu@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 reasonable, is upstream and limited to specific hw. Just hinting that this kind of change could be made with Cc: stable@vger.kernel.org in the signed-off-by block... Acked-by: Stefan Bader <stefan.bader@canonical.com>
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@canonical.com> > Signed-off-by: Rafael J. Wysocki<rjw@sisk.pl> > (cherry picked from commit 5a50a7c32d630d6cdb13d69afabb0cc81b2f379c) > > BugLink: http://bugs.launchpad.net/bugs/898503 > > Signed-off-by: Keng-Yu Lin<kengyu@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@canonical.com>
You're _sure_ this works on a 3.0.y kernel? It does not apply cleanly. rtg
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 */