OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'apei', 'battery-mwh-fix', 'bugzilla-10807', 'bugzilla-14736', 'bugzil...
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
drivers
/
acpi
/
bus.c
diff --git
a/drivers/acpi/bus.c
b/drivers/acpi/bus.c
index
5c221ab
..
310e3b9
100644
(file)
--- a/
drivers/acpi/bus.c
+++ b/
drivers/acpi/bus.c
@@
-55,7
+55,7
@@
EXPORT_SYMBOL(acpi_root_dir);
static int set_power_nocheck(const struct dmi_system_id *id)
{
printk(KERN_NOTICE PREFIX "%s detected - "
static int set_power_nocheck(const struct dmi_system_id *id)
{
printk(KERN_NOTICE PREFIX "%s detected - "
- "disable power check in power transi
s
tion\n", id->ident);
+ "disable power check in power transition\n", id->ident);
acpi_power_nocheck = 1;
return 0;
}
acpi_power_nocheck = 1;
return 0;
}
@@
-80,23
+80,15
@@
static int set_copy_dsdt(const struct dmi_system_id *id)
static struct dmi_system_id dsdt_dmi_table[] __initdata = {
/*
static struct dmi_system_id dsdt_dmi_table[] __initdata = {
/*
- * In
syde BIOS on some TOSHIBA machines corrupt the DSDT
.
+ * In
voke DSDT corruption work-around on all Toshiba Satellite
.
* https://bugzilla.kernel.org/show_bug.cgi?id=14679
*/
{
.callback = set_copy_dsdt,
* https://bugzilla.kernel.org/show_bug.cgi?id=14679
*/
{
.callback = set_copy_dsdt,
- .ident = "TOSHIBA Satellite
A505
",
+ .ident = "TOSHIBA Satellite",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A505"),
- },
- },
- {
- .callback = set_copy_dsdt,
- .ident = "TOSHIBA Satellite L505D",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L505D"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Satellite"),
},
},
{}
},
},
{}
@@
-1027,7
+1019,7
@@
static int __init acpi_init(void)
/*
* If the laptop falls into the DMI check table, the power state check
/*
* If the laptop falls into the DMI check table, the power state check
- * will be disabled in the course of device power transi
s
tion.
+ * will be disabled in the course of device power transition.
*/
dmi_check_system(power_nocheck_dmi_table);
*/
dmi_check_system(power_nocheck_dmi_table);