diff options
| author | Giuliano Pochini <pochini@shiny.it> | 2010-02-14 12:15:59 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-15 04:39:22 -0500 |
| commit | ad3499f4668f684ef6e5d0222ae14d5e4ade1fdd (patch) | |
| tree | 6c4599e78d3f29df5cd17b8d2006f69f006acea3 /sound/pci/echoaudio/indigo_express_dsp.c | |
| parent | 4f8ada444cc7a7ea70cdc81f098b34c5f1f2df41 (diff) | |
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: Giuliano Pochini <pochini@shiny.it>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/echoaudio/indigo_express_dsp.c')
| -rw-r--r-- | sound/pci/echoaudio/indigo_express_dsp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/echoaudio/indigo_express_dsp.c b/sound/pci/echoaudio/indigo_express_dsp.c index 9ab625e15652..2e4ab3e34a74 100644 --- a/sound/pci/echoaudio/indigo_express_dsp.c +++ b/sound/pci/echoaudio/indigo_express_dsp.c | |||
| @@ -61,6 +61,7 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate) | |||
| 61 | 61 | ||
| 62 | control_reg |= clock; | 62 | control_reg |= clock; |
| 63 | if (control_reg != old_control_reg) { | 63 | if (control_reg != old_control_reg) { |
| 64 | DE_ACT(("set_sample_rate: %d clock %d\n", rate, clock)); | ||
| 64 | chip->comm_page->control_register = cpu_to_le32(control_reg); | 65 | chip->comm_page->control_register = cpu_to_le32(control_reg); |
| 65 | chip->sample_rate = rate; | 66 | chip->sample_rate = rate; |
| 66 | clear_handshake(chip); | 67 | clear_handshake(chip); |