Commit b3a5402c authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda: Fix the audio-component completion timeout

The timeout of audio component binding was incorrectly specified in
msec, not in jiffies, which results in way too shorter timeout than
expected.

Along with fixing it, add the information print about the binding
failure to show the unexpected situation more clearly.

Fixes: a57942bf ("ALSA: hda: Make audio component support more generic")
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 196f4eee
...@@ -145,9 +145,11 @@ int snd_hdac_i915_init(struct hdac_bus *bus) ...@@ -145,9 +145,11 @@ int snd_hdac_i915_init(struct hdac_bus *bus)
if (!acomp->ops) { if (!acomp->ops) {
request_module("i915"); request_module("i915");
/* 10s timeout */ /* 10s timeout */
wait_for_completion_timeout(&bind_complete, 10 * 1000); wait_for_completion_timeout(&bind_complete,
msecs_to_jiffies(10 * 1000));
} }
if (!acomp->ops) { if (!acomp->ops) {
dev_info(bus->dev, "couldn't bind with audio component\n");
snd_hdac_acomp_exit(bus); snd_hdac_acomp_exit(bus);
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment