diff options
author | David S. Miller <davem@davemloft.net> | 2018-10-06 14:43:42 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-06 14:43:42 -0700 |
commit | 72438f8cef4e75a22140853baa4c68392c721b22 (patch) | |
tree | 78b7b6dafd827e0d55150a227db3978d91c0b6dd /sound/hda/hdac_i915.c | |
parent | fb4ee67529ff3e4c5874768477887c2df5714c96 (diff) | |
parent | c1d84a1b42ef70d8ae601df9cadedc7ed4f1beb1 (diff) | |
download | linux-72438f8cef4e75a22140853baa4c68392c721b22.tar.gz linux-72438f8cef4e75a22140853baa4c68392c721b22.tar.bz2 linux-72438f8cef4e75a22140853baa4c68392c721b22.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'sound/hda/hdac_i915.c')
-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 b5282cbbe489..617ff1aa818f 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; } |