Commit 327e8ba5 authored by Kai Vehmanen's avatar Kai Vehmanen Committed by Takashi Iwai
Browse files

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: default avatarRamalingam C <ramalingam.c@intel.com>
Signed-off-by: default avatarRamalingam C <ramalingam.c@intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Acked-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://lore.kernel.org/r/20220309182439.1053856-1-kai.vehmanen@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7cacfa4a

sound/hda/hdac_i915.c

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ 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,

			wait_for_completion_killable_timeout(&acomp->master_bind_complete,

							     msecs_to_jiffies(60 * 1000));

		}

	}