summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-29 20:05:05 +0400
committerTakashi Iwai <tiwai@suse.de>2009-06-29 20:05:05 +0400
commit0baddbc895a8646b8ce28473897cfb7bb212d4ef (patch)
tree9828d02856b9a50d6f44cdaa21865a6d31c7da86 /sound
parentcdae219cec501ae4fba60e92c7a2a3aad1625b8d (diff)
parent7e895cfaad51c862932ea7db0c428761076412e5 (diff)
downloadlinux-0baddbc895a8646b8ce28473897cfb7bb212d4ef.tar.xz
Merge branch 'fix/lx6464es' into for-linus
* fix/lx6464es: ALSA: lx6464es - configure ethersound io channels
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/lx6464es/lx6464es.c7
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;