lkml.org 
[lkml]   [2013]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 05/77] ALSA: emu10k1: Load firmware when it was already cached
    Date
    3.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Florian Zeitz <florob@babelmonkeys.de>

    commit b56ddbe55a363eee4ff7410a97050dad08215f7c upstream.

    This expands the regression fix from
    d28215996b0c3a900411769039aa3c54cf7008ab.
    The firmware also needs to be loaded when it was already cached.

    Signed-off-by: Florian Zeitz <florob@babelmonkeys.de>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/pci/emu10k1/emu10k1_main.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    --- a/sound/pci/emu10k1/emu10k1_main.c
    +++ b/sound/pci/emu10k1/emu10k1_main.c
    @@ -860,11 +860,12 @@ static int snd_emu10k1_emu1010_init(stru
    }
    snd_printk(KERN_INFO "emu1010: firmware file = %s, size = 0x%zx\n",
    filename, emu->firmware->size);
    - err = snd_emu1010_load_firmware(emu);
    - if (err != 0) {
    - snd_printk(KERN_INFO "emu1010: Loading Firmware file %s failed\n", filename);
    - return err;
    - }
    + }
    +
    + err = snd_emu1010_load_firmware(emu);
    + if (err != 0) {
    + snd_printk(KERN_INFO "emu1010: Loading Firmware failed\n");
    + return err;
    }

    /* ID, should read & 0x7f = 0x55 when FPGA programmed. */



    \
     
     \ /
      Last update: 2013-03-01 22:41    [W:4.035 / U:0.332 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site