Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3690869 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Takashi Iwai
Browse files

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: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4c414216

sound/pci/echoaudio/echoaudio.c

+2 −1
Original line number Diff line number Diff line
@@ -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"));

sound/pci/echoaudio/echoaudio.h

+2 −1
Original line number Diff line number Diff line
@@ -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);

sound/pci/echoaudio/echoaudio_dsp.c

+5 −5
Original line number Diff line number Diff line
@@ -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;