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>
		
			
				
	
	
		
			71 lines
		
	
	
	
		
			2.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			71 lines
		
	
	
	
		
			2.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/************************************************************************
 | 
						|
 | 
						|
This file is part of Echo Digital Audio's generic driver library.
 | 
						|
Copyright Echo Digital Audio Corporation (c) 1998 - 2005
 | 
						|
All rights reserved
 | 
						|
www.echoaudio.com
 | 
						|
 | 
						|
This library is free software; you can redistribute it and/or
 | 
						|
modify it under the terms of the GNU Lesser General Public
 | 
						|
License as published by the Free Software Foundation; either
 | 
						|
version 2.1 of the License, or (at your option) any later version.
 | 
						|
 | 
						|
This library is distributed in the hope that it will be useful,
 | 
						|
but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
Lesser General Public License for more details.
 | 
						|
 | 
						|
You should have received a copy of the GNU Lesser General Public
 | 
						|
License along with this library; if not, write to the Free Software
 | 
						|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 | 
						|
 | 
						|
*************************************************************************
 | 
						|
 | 
						|
 Translation from C++ and adaptation for use in ALSA-Driver
 | 
						|
 were made by Giuliano Pochini <pochini@shiny.it>
 | 
						|
 | 
						|
*************************************************************************/
 | 
						|
 | 
						|
static int update_vmixer_level(struct echoaudio *chip);
 | 
						|
static int set_vmixer_gain(struct echoaudio *chip, u16 output,
 | 
						|
			   u16 pipe, int gain);
 | 
						|
 | 
						|
 | 
						|
static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
 | 
						|
{
 | 
						|
	int err;
 | 
						|
 | 
						|
	DE_INIT(("init_hw() - Indigo IOx\n"));
 | 
						|
	if (snd_BUG_ON((subdevice_id & 0xfff0) != INDIGO_IOX))
 | 
						|
		return -ENODEV;
 | 
						|
 | 
						|
	err = init_dsp_comm_page(chip);
 | 
						|
	if (err < 0) {
 | 
						|
		DE_INIT(("init_hw - could not initialize DSP comm page\n"));
 | 
						|
		return err;
 | 
						|
	}
 | 
						|
 | 
						|
	chip->device_id = device_id;
 | 
						|
	chip->subdevice_id = subdevice_id;
 | 
						|
	chip->bad_board = TRUE;
 | 
						|
	chip->dsp_code_to_load = FW_INDIGO_IOX_DSP;
 | 
						|
	/* Since this card has no ASIC, mark it as loaded so everything
 | 
						|
	   works OK */
 | 
						|
	chip->asic_loaded = TRUE;
 | 
						|
	chip->input_clock_types = ECHO_CLOCK_BIT_INTERNAL;
 | 
						|
 | 
						|
	err = load_firmware(chip);
 | 
						|
	if (err < 0)
 | 
						|
		return err;
 | 
						|
	chip->bad_board = FALSE;
 | 
						|
 | 
						|
	DE_INIT(("init_hw done\n"));
 | 
						|
	return err;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
 | 
						|
static int set_mixer_defaults(struct echoaudio *chip)
 | 
						|
{
 | 
						|
	return init_line_levels(chip);
 | 
						|
}
 |