| Message ID | 1400739312-6326-1-git-send-email-yidi.lin@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Thu, May 22, 2014 at 02:15:12PM +0800, Edward Lin wrote: > BugLink: https://bugs.launchpad.net/bugs/1288161 > > With win8 capabiltiy, the machine will boot itself immediately after > shutdown command has executed. > > Work around this issue by disabling win8 capcability. This workaround > also makes wireless hotkey work. > > Signed-off-by: Edward Lin <yidi.lin@canonical.com> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > (cherry picked from commit b753631b3576bf343151a82513c5d56fcda1e24f) > Signed-off-by: Edward Lin <yidi.lin@canonical.com> > --- > drivers/acpi/blacklist.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c > index 60d427f..223f8b7 100644 > --- a/drivers/acpi/blacklist.c > +++ b/drivers/acpi/blacklist.c > @@ -315,6 +315,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { > DMI_MATCH(DMI_PRODUCT_VERSION, "2349D15"), > }, > }, > + { > + .callback = dmi_disable_osi_win8, > + .ident = "Dell Inspiron 7737", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), > + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7737"), > + }, > + }, > > /* > * The following Lenovo models have a broken workaround in the Direct cherry-pick, looks sane. Therefore: Acked-by: Andy Whitcroft <apw@canonical.com> -apw
On 22/05/14 07:15, Edward Lin wrote: > BugLink: https://bugs.launchpad.net/bugs/1288161 > > With win8 capabiltiy, the machine will boot itself immediately after > shutdown command has executed. > > Work around this issue by disabling win8 capcability. This workaround > also makes wireless hotkey work. > > Signed-off-by: Edward Lin <yidi.lin@canonical.com> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > (cherry picked from commit b753631b3576bf343151a82513c5d56fcda1e24f) > Signed-off-by: Edward Lin <yidi.lin@canonical.com> > --- > drivers/acpi/blacklist.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c > index 60d427f..223f8b7 100644 > --- a/drivers/acpi/blacklist.c > +++ b/drivers/acpi/blacklist.c > @@ -315,6 +315,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { > DMI_MATCH(DMI_PRODUCT_VERSION, "2349D15"), > }, > }, > + { > + .callback = dmi_disable_osi_win8, > + .ident = "Dell Inspiron 7737", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), > + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7737"), > + }, > + }, > > /* > * The following Lenovo models have a broken workaround in the > clean upstream cherry pick and it is limited to a specific device, so Acked-by: Colin Ian King <colin.king@canonical.com>
Applied to Trusty. -apw
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index 60d427f..223f8b7 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c @@ -315,6 +315,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { DMI_MATCH(DMI_PRODUCT_VERSION, "2349D15"), }, }, + { + .callback = dmi_disable_osi_win8, + .ident = "Dell Inspiron 7737", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7737"), + }, + }, /* * The following Lenovo models have a broken workaround in the