summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/osl.c
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2016-05-03 16:48:32 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-05 00:13:52 +0200
commita707edebadf1230f202000f29b28b7586ada4aa3 (patch)
treeb6f7e93e1a687a6aa9d0979f78f8cde08a0d5b77 /drivers/acpi/osl.c
parentdbee890bf69ad62c021e299e24881fdcd1f2c481 (diff)
downloadlinux-a707edebadf1230f202000f29b28b7586ada4aa3.tar.bz2
ACPI / osi: Add acpi_osi=!! to allow reverting acpi_osi=!
This patch introduces acpi_osi=!! so that quirks may use it to revert acpi_osi=!. Tested-by: Lukas Wunner <lukas@wunner.de> Tested-by: Chen Yu <yu.c.chen@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/osl.c')
-rw-r--r--drivers/acpi/osl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 9f59dd1a0af7..f801b59f2a94 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1763,6 +1763,9 @@ void __init acpi_osi_setup(char *str)
osi->enable = false;
}
return;
+ } else if (*str == '!') {
+ osi_config.default_disabling = 0;
+ return;
}
enable = false;
}