[PATCH 1/2] ALSA: echoaudio: add reference of struct echoaudio

[Sudip Mukherjee]

added reference of struct echoaudio to free_firmware function.
this structure will be later used to get a reference of the card
when converting snd_printk to dev_* in the next patch of the series.

Signed-off-by: Sudip Mukherjee <su...@vectorindia.org>
---
 sound/pci/echoaudio/echoaudio.c     |  3 ++-
 sound/pci/echoaudio/echoaudio.h     |  3 ++-
 sound/pci/echoaudio/echoaudio_dsp.c | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index d82321f..db1b247 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -69,7 +69,8 @@ static int get_firmware(const struct firmware **fw_entry,
 
 
 
-static void free_firmware(const struct firmware *fw_entry)
+static void free_firmware(const struct firmware *fw_entry,
+                         struct echoaudio *chip)
 {
 #ifdef CONFIG_PM_SLEEP
        DE_ACT(("firmware not released (kept in cache)\n"));
diff --git a/sound/pci/echoaudio/echoaudio.h b/sound/pci/echoaudio/echoaudio.h
index b86b88d..a4f112a 100644
--- a/sound/pci/echoaudio/echoaudio.h
+++ b/sound/pci/echoaudio/echoaudio.h
@@ -468,7 +468,8 @@ static int wait_handshake(struct echoaudio *chip);
 static int send_vector(struct echoaudio *chip, u32 command);
 static int get_firmware(const struct firmware **fw_entry,
                        struct echoaudio *chip, const short fw_index);
-static void free_firmware(const struct firmware *fw_entry);
+static void free_firmware(const struct firmware *fw_entry,
+                         struct echoaudio *chip);
 
 #ifdef ECHOCARD_HAS_MIDI
 static int enable_midi_input(struct echoaudio *chip, char enable);
diff --git a/sound/pci/echoaudio/echoaudio_dsp.c 
b/sound/pci/echoaudio/echoaudio_dsp.c
index 5a6a217..977b2bd 100644
--- a/sound/pci/echoaudio/echoaudio_dsp.c
+++ b/sound/pci/echoaudio/echoaudio_dsp.c
@@ -206,12 +206,12 @@ static int load_asic_generic(struct echoaudio *chip, u32 
cmd, short asic)
        }
 
        DE_INIT(("ASIC loaded\n"));
-       free_firmware(fw);
+       free_firmware(fw, chip);
        return 0;
 
 la_error:
        DE_INIT(("failed on write_dsp\n"));
-       free_firmware(fw);
+       free_firmware(fw, chip);
        return -EIO;
 }
 
@@ -317,11 +317,11 @@ static int install_resident_loader(struct echoaudio *chip)
        }
 
        DE_INIT(("Resident loader successfully installed\n"));
-       free_firmware(fw);
+       free_firmware(fw, chip);
        return 0;
 
 irl_error:
-       free_firmware(fw);
+       free_firmware(fw, chip);
        return -EIO;
 }
 
@@ -491,7 +491,7 @@ static int load_firmware(struct echoaudio *chip)
        if (err < 0)
                return err;
        err = load_dsp(chip, (u16 *)fw->data);
-       free_firmware(fw);
+       free_firmware(fw, chip);
        if (err < 0)
                return err;
 
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/