ALSA: echoaudio: add reference of struct echoaudio
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 <sudip@vectorindia.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Родитель
4c41421657
Коммит
e369086968
|
@ -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"));
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче