> @@ -172,18 +172,10 @@ int snd_hdac_i915_init(struct hdac_bus *bus, bool allow_modprobe) > acomp = bus->audio_component; > if (!acomp) > return -ENODEV; > - if (allow_modprobe && !acomp->ops) { > - if (!IS_ENABLED(CONFIG_MODULES) || > - !request_module("i915")) { > - /* 60s timeout */ > - wait_for_completion_killable_timeout(&acomp->master_bind_complete, > - msecs_to_jiffies(60 * 1000)); heads-up that I have a conflicting patch to make the 60s delay configurable, see https://github.com/thesofproject/linux/pull/4505 > - } > - } > if (!acomp->ops) { > - int err = allow_modprobe ? -ENODEV : -EPROBE_DEFER; > snd_hdac_acomp_exit(bus); > - return dev_err_probe(bus->dev, err, "couldn't bind with audio component\n"); > + return dev_err_probe(bus->dev, -EPROBE_DEFER, > + "couldn't bind with audio component\n"); > } > return 0; > }