aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-08-29 23:01:58 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-03 11:40:25 -0700
commit9f4929636f54a0cc33e249d507356bbc3224c7b3 (patch)
tree091e10e53082fb3de51125416514234cd1b8b9d1 /drivers/acpi
parentfb88e8c4a2b208606f5ee7e5dc087d2ade9525ce (diff)
downloadkernel_samsung_smdk4412-9f4929636f54a0cc33e249d507356bbc3224c7b3.zip
kernel_samsung_smdk4412-9f4929636f54a0cc33e249d507356bbc3224c7b3.tar.gz
kernel_samsung_smdk4412-9f4929636f54a0cc33e249d507356bbc3224c7b3.tar.bz2
acpica: ACPI_MAX_SLEEP should be 2 sec, not 20
commit b33c25d6a62ac253caabda2b5f43258abff451c0 upstream. This limit is a workaround for AML that sleeps too long, but the workaround didn't work b/c of a typo. https://bugzilla.kernel.org/show_bug.cgi?id=13195 Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/acconfig.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acconfig.h b/drivers/acpi/acpica/acconfig.h
index bc533dd..f895a24 100644
--- a/drivers/acpi/acpica/acconfig.h
+++ b/drivers/acpi/acpica/acconfig.h
@@ -121,7 +121,7 @@
/* Maximum sleep allowed via Sleep() operator */
-#define ACPI_MAX_SLEEP 20000 /* Two seconds */
+#define ACPI_MAX_SLEEP 2000 /* Two seconds */
/******************************************************************************
*