diff options
| author |  Giuliano Pochini <pochini@shiny.it>
| 2010-02-14 18:15:34 +0100 |
|---|---|---|
| committer |  Takashi Iwai <tiwai@suse.de>
| 2010-02-15 10:36:51 +0100 |
| commit | 19b50063780953563e3c3a2867c39aad7b9e64cf (patch) | |
| tree | 0b26395a9d785f1684e2a7f489735ce577a8c1ac /sound/pci/echoaudio/echoaudio_3g.c | |
| parent | Merge remote branch 'alsa/devel' into topic/misc (diff) | |
| download | linux-19b50063780953563e3c3a2867c39aad7b9e64cf.tar.gz linux-19b50063780953563e3c3a2867c39aad7b9e64cf.tar.bz2 linux-19b50063780953563e3c3a2867c39aad7b9e64cf.zip | |
ALSA: Echoaudio - Add firmware cache #1
Changes the way the firmware is passed through functions.
When CONFIG_PM is enabled the firmware cannot be released because the
driver will need it again to resume the card.
With this patch the firmware is passed as an index of the struct
firmware card_fw[] in place of a pointer. That same index is then used
to locate the firmware in the firmware cache.
Signed-off-by: Giuliano Pochini <pochini@shiny.it>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/echoaudio/echoaudio_3g.c')
| -rw-r--r-- | sound/pci/echoaudio/echoaudio_3g.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/echoaudio/echoaudio_3g.c b/sound/pci/echoaudio/echoaudio_3g.c index e32a74897921..658db44ef746 100644 --- a/sound/pci/echoaudio/echoaudio_3g.c +++ b/sound/pci/echoaudio/echoaudio_3g.c @@ -227,12 +227,11 @@ static int load_asic(struct echoaudio *chip) /* Give the DSP a few milliseconds to settle down */ mdelay(2); - err = load_asic_generic(chip, DSP_FNC_LOAD_3G_ASIC, - &card_fw[FW_3G_ASIC]); + err = load_asic_generic(chip, DSP_FNC_LOAD_3G_ASIC, FW_3G_ASIC); if (err < 0) return err; - chip->asic_code = &card_fw[FW_3G_ASIC]; + chip->asic_code = FW_3G_ASIC; /* Now give the new ASIC some time to set up */ msleep(1000); |