diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-09-18 18:21:11 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-09-20 08:36:03 +0200 |
| commit | b3a5402cbcebaf5a9db4d6a3268070e4a099355d (patch) | |
| tree | 892b9db0e2e7b2663f0df8a56c45c5785189df6f /sound | |
| parent | 196f4eeeb78f53e0a598db8f9408b6f8b270c355 (diff) | |
| download | linux-0-day-b3a5402cbcebaf5a9db4d6a3268070e4a099355d.tar.gz linux-0-day-b3a5402cbcebaf5a9db4d6a3268070e4a099355d.tar.xz | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/hda/hdac_i915.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index b5282cbbe4898..617ff1aa818f9 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -145,9 +145,11 @@ int snd_hdac_i915_init(struct hdac_bus *bus) if (!acomp->ops) { request_module("i915"); /* 10s timeout */ - wait_for_completion_timeout(&bind_complete, 10 * 1000); + wait_for_completion_timeout(&bind_complete, + msecs_to_jiffies(10 * 1000)); } if (!acomp->ops) { + dev_info(bus->dev, "couldn't bind with audio component\n"); snd_hdac_acomp_exit(bus); return -ENODEV; } |