lkml.org 
[lkml]   [2012]   [Aug]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] ALSA: hda - Defer probe when loading patch firmware
    Date
    Recent changes to the firmware loading helpers cause drivers to stall
    when firmware is loaded during the module_init() call. The snd-hda-intel
    module requests firmware if the patch= parameter is used to load a patch
    file. This patch works around the problem by deferring the probe in such
    cases, which will cause the module to load successfully and the driver
    binding to the device outside the module_init() call.

    Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
    ---
    sound/pci/hda/hda_intel.c | 11 +++++++++++
    1 file changed, 11 insertions(+)

    diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
    index c8aced1..296616e 100644
    --- a/sound/pci/hda/hda_intel.c
    +++ b/sound/pci/hda/hda_intel.c
    @@ -69,6 +69,7 @@ static int probe_only[SNDRV_CARDS];
    static bool single_cmd;
    static int enable_msi = -1;
    #ifdef CONFIG_SND_HDA_PATCH_LOADER
    +static bool deferred[SNDRV_CARDS];
    static char *patch[SNDRV_CARDS];
    #endif
    #ifdef CONFIG_SND_HDA_INPUT_BEEP
    @@ -3156,6 +3157,16 @@ static int __devinit azx_probe(struct pci_dev *pci,

    if (dev >= SNDRV_CARDS)
    return -ENODEV;
    +
    +#ifdef CONFIG_SND_HDA_PATCH_LOADER
    + if (patch[dev] && *patch[dev] && !deferred[dev]) {
    + snd_printk(KERN_ERR SFX "deferring probe for patch %s\n",
    + patch[dev]);
    + deferred[dev] = true;
    + return -EPROBE_DEFER;
    + }
    +#endif
    +
    if (!enable[dev]) {
    dev++;
    return -ENOENT;
    --
    1.7.11.4


    \
     
     \ /
      Last update: 2012-08-09 09:24    [W:5.530 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site