aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-06-24 18:35:16 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-24 18:35:16 -0400
commitfff3b16d2754a061a3549c4307a186423a0128fd (patch)
tree3303d9e0c9e8c3450421d62afde2526dba2e7e26 /kernel/power
parent8c506608c3b2eac939fa244bcdea5faa31818f95 (diff)
PM / sleep: Increase default DPM watchdog timeout to 60
Many harddisks (mostly WD ones) have firmware problems and take too long, more than 10 seconds, to resume from suspend. And this often exceeds the default DPM watchdog timeout (12 seconds), resulting in a kernel panic out of sudden. Since most distros just take the default as is, we should give a bit more safer value. This patch increases the default value from 12 seconds to one minute, which has been confirmed to be long enough for such problematic disks. Link: https://bugzilla.kernel.org/show_bug.cgi?id=91921 Fixes: 70fea60d888d (PM / Sleep: Detect device suspend/resume lockup and log event) Cc: 3.13+ <stable@vger.kernel.org> # 3.13+ Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 7e01f78f0417..9e302315e33d 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -187,7 +187,7 @@ config DPM_WATCHDOG
187config DPM_WATCHDOG_TIMEOUT 187config DPM_WATCHDOG_TIMEOUT
188 int "Watchdog timeout in seconds" 188 int "Watchdog timeout in seconds"
189 range 1 120 189 range 1 120
190 default 12 190 default 60
191 depends on DPM_WATCHDOG 191 depends on DPM_WATCHDOG
192 192
193config PM_TRACE 193config PM_TRACE