diff options
| author | Kai Vehmanen <kai.vehmanen@linux.intel.com> | 2022-03-09 21:24:39 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-03-10 16:35:54 +0300 |
| commit | 327e8ba54a212f707a68670c9372747b7a32bb92 (patch) | |
| tree | 89a413de45f7707d0cda2e04a07969dd8f731951 /sound/hda | |
| parent | 7cacfa4a7b0dcf8f10dda5327957ee13db1c455f (diff) | |
| download | linux-327e8ba54a212f707a68670c9372747b7a32bb92.tar.xz | |
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>
Diffstat (limited to 'sound/hda')
| -rw-r--r-- | sound/hda/hdac_i915.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 454474ac5716..efe810af28c5 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -160,8 +160,8 @@ int snd_hdac_i915_init(struct hdac_bus *bus) if (!IS_ENABLED(CONFIG_MODULES) || !request_module("i915")) { /* 60s timeout */ - wait_for_completion_timeout(&acomp->master_bind_complete, - msecs_to_jiffies(60 * 1000)); + wait_for_completion_killable_timeout(&acomp->master_bind_complete, + msecs_to_jiffies(60 * 1000)); } } if (!acomp->ops) { |