summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-12 23:44:52 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-12 23:44:52 -0400
commit989b15046a452a1490ea1dd46755c63ce6376ad6 (patch)
tree99083816f8531f5520ae7280e05270b08df2856a
parent44bd49c14edc461df9dcc89d667a57758d6f0f00 (diff)
downloadlongterm-queue-4.8-989b15046a452a1490ea1dd46755c63ce6376ad6.tar.gz
ACPI: refresh for context
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/ACPI-button-Change-default-behavior-to-lid_init_stat.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/queue/ACPI-button-Change-default-behavior-to-lid_init_stat.patch b/queue/ACPI-button-Change-default-behavior-to-lid_init_stat.patch
index 86575d2..1d1aaf3 100644
--- a/queue/ACPI-button-Change-default-behavior-to-lid_init_stat.patch
+++ b/queue/ACPI-button-Change-default-behavior-to-lid_init_stat.patch
@@ -1,4 +1,4 @@
-From 77e9a4aa9de10cc1418bf9a892366988802a8025 Mon Sep 17 00:00:00 2001
+From 85ee890f9311ef647f60b9292398d3cbeab91b24 Mon Sep 17 00:00:00 2001
From: Lv Zheng <lv.zheng@intel.com>
Date: Thu, 12 Jan 2017 15:47:34 +0800
Subject: [PATCH] ACPI / button: Change default behavior to lid_init_state=open
@@ -98,20 +98,21 @@ As a conclusion:
Link: https://bugzilla.kernel.org/show_bug.cgi?id=187271
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
-index e19f530f1083..6d5a8c1d3132 100644
+index 31abb0bdd4f2..0a4ff598c9c6 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
-@@ -113,7 +113,7 @@ struct acpi_button {
+@@ -109,7 +109,7 @@ struct acpi_button {
static BLOCKING_NOTIFIER_HEAD(acpi_lid_notifier);
static struct acpi_device *lid_device;
-static u8 lid_init_state = ACPI_BUTTON_LID_INIT_METHOD;
+static u8 lid_init_state = ACPI_BUTTON_LID_INIT_OPEN;
- static unsigned long lid_report_interval __read_mostly = 500;
- module_param(lid_report_interval, ulong, 0644);
+ /* --------------------------------------------------------------------------
+ FS Interface (/proc)
--
2.12.0