Skip to content

Commit 327e8ba

Browse files
kv2019itiwai
authored andcommitted
ALSA: hda/i915 - avoid hung task timeout in i915 wait
If kernel is built with hung task detection enabled and CONFIG_DEFAULT_HUNG_TASK_TIMEOUT set to less than 60 seconds, snd_hdac_i915_init() will trigger the hung task timeout in case i915 is not available and taint the kernel. Use wait_for_completion_killable_timeout() for the wait to avoid this problem. Co-developed-by: Ramalingam C <ramalingam.c@intel.com> Signed-off-by: Ramalingam C <ramalingam.c@intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://lore.kernel.org/r/20220309182439.1053856-1-kai.vehmanen@linux.intel.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 7cacfa4 commit 327e8ba

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

sound/hda/hdac_i915.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ int snd_hdac_i915_init(struct hdac_bus *bus)
160160
if (!IS_ENABLED(CONFIG_MODULES) ||
161161
!request_module("i915")) {
162162
/* 60s timeout */
163-
wait_for_completion_timeout(&acomp->master_bind_complete,
164-
msecs_to_jiffies(60 * 1000));
163+
wait_for_completion_killable_timeout(&acomp->master_bind_complete,
164+
msecs_to_jiffies(60 * 1000));
165165
}
166166
}
167167
if (!acomp->ops) {

0 commit comments

Comments
 (0)