Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[linux-2.6-microblaze.git] / sound / hda / hdac_i915.c

diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index 454474a..efe810a 100644 (file)
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -160,8 +160,8 @@ 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,
-                                                   msecs_to_jiffies(60 * 1000));
+                       wait_for_completion_killable_timeout(&acomp->master_bind_complete,
+                                                            msecs_to_jiffies(60 * 1000));
                }
        }
        if (!acomp->ops) {