diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-25 09:42:49 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-25 09:42:49 +0200 |
| commit | 1faacd57ad172464dec44d4f2f7d5ca9ec0d3c38 (patch) | |
| tree | 7c11ee153e1ba1d42c656d1012c64e775f5a616c /sound | |
| parent | d4c1c3d1601ec0e1cda58770f52f7d2c9be244d0 (diff) | |
| parent | 7e895cfaad51c862932ea7db0c428761076412e5 (diff) | |
Merge branch 'fix/lx6464es' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/lx6464es/lx6464es.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c index 18da2ef04d09..11b8c6514b3d 100644 --- a/sound/pci/lx6464es/lx6464es.c +++ b/sound/pci/lx6464es/lx6464es.c @@ -654,13 +654,12 @@ static int __devinit lx_init_ethersound_config(struct lx6464es *chip) int i; u32 orig_conf_es = lx_dsp_reg_read(chip, eReg_CONFES); - u32 default_conf_es = (64 << IOCR_OUTPUTS_OFFSET) | + /* configure 64 io channels */ + u32 conf_es = (orig_conf_es & CONFES_READ_PART_MASK) | (64 << IOCR_INPUTS_OFFSET) | + (64 << IOCR_OUTPUTS_OFFSET) | (FREQ_RATIO_SINGLE_MODE << FREQ_RATIO_OFFSET); - u32 conf_es = (orig_conf_es & CONFES_READ_PART_MASK) - | (default_conf_es & CONFES_WRITE_PART_MASK); - snd_printdd("->lx_init_ethersound\n"); chip->freq_ratio = FREQ_RATIO_SINGLE_MODE; |