浏览代码

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: a57942bfdd61 ("ALSA: hda: Make audio component support more generic")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 7 年之前
父节点
当前提交
b3a5402cbc
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      sound/hda/hdac_i915.c

+ 3 - 1
sound/hda/hdac_i915.c

@@ -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;
 	}
 	}