diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-08-06 12:46:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-08-06 12:46:35 +0200 |
| commit | dae02c8c64937532466d95fdb6ead6ada8000673 (patch) | |
| tree | 1aa28cc48c37996a7e75aceb5f2430b7f0305127 /sound/hda | |
| parent | 74f94e41825549638a5b24410c1f62d5ea57134e (diff) | |
| parent | a67060201b746a308b1674f66bf289c9faef6d09 (diff) | |
| download | linux-rpi-dae02c8c64937532466d95fdb6ead6ada8000673.tar.gz linux-rpi-dae02c8c64937532466d95fdb6ead6ada8000673.tar.bz2 linux-rpi-dae02c8c64937532466d95fdb6ead6ada8000673.zip | |
Merge branch 'for-linus' into for-next
Pull 5.3 development branch for further fixes of USB-audio stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda')
| -rw-r--r-- | sound/hda/hdac_i915.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 1192c7561d62..3c2db3816029 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -136,10 +136,12 @@ int snd_hdac_i915_init(struct hdac_bus *bus) if (!acomp) return -ENODEV; if (!acomp->ops) { - request_module("i915"); - /* 60s timeout */ - wait_for_completion_timeout(&bind_complete, - msecs_to_jiffies(60 * 1000)); + if (!IS_ENABLED(CONFIG_MODULES) || + !request_module("i915")) { + /* 60s timeout */ + wait_for_completion_timeout(&bind_complete, + msecs_to_jiffies(60 * 1000)); + } } if (!acomp->ops) { dev_info(bus->dev, "couldn't bind with audio component\n"); |