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

Commit ad3499f4 authored by Giuliano Pochini's avatar Giuliano Pochini Committed by Takashi Iwai
Browse files

ALSA: Echoaudio - Add suspend support #1 



Move the controls init code outside the init_hw() function because is must
not be called during resume.

This patch moves the code that initializes the card's controls with
default valued from the init_hw() function into a separated
set_mixer_defaults() function (one for each of the 16 supported
cards). This change is necessary because during resume we must
resurrect the hardware without losing the previous
settings. set_mixer_defaults() must be called only once when the
module is loaded.

Signed-off-by: default avatarGiuliano Pochini <pochini@shiny.it>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4f8ada44

sound/pci/echoaudio/darla20_dsp.c

+7 −3
Original line number Diff line number Diff line
@@ -57,15 +57,19 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) 
		return err;

	chip->bad_board = FALSE;



	if ((err = init_line_levels(chip)) < 0)

		return err;



	DE_INIT(("init_hw done\n"));

	return err;

}







static int set_mixer_defaults(struct echoaudio *chip)

{

	return init_line_levels(chip);

}







/* The Darla20 has no external clock sources */

static u32 detect_input_clocks(const struct echoaudio *chip)

{

sound/pci/echoaudio/darla24_dsp.c

+7 −3
Original line number Diff line number Diff line
@@ -56,15 +56,19 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) 
		return err;

	chip->bad_board = FALSE;



	if ((err = init_line_levels(chip)) < 0)

		return err;



	DE_INIT(("init_hw done\n"));

	return err;

}







static int set_mixer_defaults(struct echoaudio *chip)

{

	return init_line_levels(chip);

}







static u32 detect_input_clocks(const struct echoaudio *chip)

{

	u32 clocks_from_dsp, clock_bits;

sound/pci/echoaudio/echo3g_dsp.c

+12 −14
Original line number Diff line number Diff line
@@ -97,23 +97,21 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) 
	chip->digital_modes =	ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_RCA |

				ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_OPTICAL |

				ECHOCAPS_HAS_DIGITAL_MODE_ADAT;



	DE_INIT(("init_hw done\n"));

	return err;

}







static int set_mixer_defaults(struct echoaudio *chip)

{

	chip->digital_mode = DIGITAL_MODE_SPDIF_RCA;

	chip->professional_spdif = FALSE;

	chip->non_audio_spdif = FALSE;

	chip->bad_board = FALSE;



	if ((err = init_line_levels(chip)) < 0)

		return err;

	err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);

	if (err < 0)

		return err;

	err = set_phantom_power(chip, 0);

	if (err < 0)

		return err;

	err = set_professional_spdif(chip, TRUE);



	DE_INIT(("init_hw done\n"));

	return err;

	chip->phantom_power = FALSE;

	return init_line_levels(chip);

}

sound/pci/echoaudio/gina20_dsp.c

+8 −5
Original line number Diff line number Diff line
@@ -62,13 +62,16 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) 
		return err;

	chip->bad_board = FALSE;



	if ((err = init_line_levels(chip)) < 0)

	DE_INIT(("init_hw done\n"));

	return err;

}



	err = set_professional_spdif(chip, TRUE);



	DE_INIT(("init_hw done\n"));

	return err;



static int set_mixer_defaults(struct echoaudio *chip)

{

	chip->professional_spdif = FALSE;

	return init_line_levels(chip);

}

sound/pci/echoaudio/gina24_dsp.c

+10 −10
Original line number Diff line number Diff line
@@ -57,9 +57,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) 
		ECHO_CLOCK_BIT_INTERNAL | ECHO_CLOCK_BIT_SPDIF |

		ECHO_CLOCK_BIT_ESYNC | ECHO_CLOCK_BIT_ESYNC96 |

		ECHO_CLOCK_BIT_ADAT;

	chip->professional_spdif = FALSE;

	chip->digital_in_automute = TRUE;

	chip->digital_mode = DIGITAL_MODE_SPDIF_RCA;



	/* Gina24 comes in both '301 and '361 flavors */

	if (chip->device_id == DEVICE_ID_56361) {
@@ -81,19 +78,22 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) 
		return err;

	chip->bad_board = FALSE;



	if ((err = init_line_levels(chip)) < 0)

		return err;

	err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);

	if (err < 0)

		return err;

	err = set_professional_spdif(chip, TRUE);



	DE_INIT(("init_hw done\n"));

	return err;

}







static int set_mixer_defaults(struct echoaudio *chip)

{

	chip->digital_mode = DIGITAL_MODE_SPDIF_RCA;

	chip->professional_spdif = FALSE;

	chip->digital_in_automute = TRUE;

	return init_line_levels(chip);

}







static u32 detect_input_clocks(const struct echoaudio *chip)

{

	u32 clocks_from_dsp, clock_bits;