summaryrefslogtreecommitdiffstats
path: root/sound/pci/lx6464es/lx6464es.c
diff options
context:
space:
mode:
authorTim Blechmann <tim@klingt.org>2009-06-25 09:41:46 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-25 09:41:53 +0200
commit7e895cfaad51c862932ea7db0c428761076412e5 (patch)
tree105ceaef606b3086260ebeb725611d42e881cf21 /sound/pci/lx6464es/lx6464es.c
parentLinux 2.6.31-rc1 (diff)
downloadlinux-7e895cfaad51c862932ea7db0c428761076412e5.tar.xz
linux-7e895cfaad51c862932ea7db0c428761076412e5.zip
ALSA: lx6464es - configure ethersound io channels
as long as the io channel number is not set by the driver, the card is not visible from the ethersound network Signed-off-by: Tim Blechmann <tim@klingt.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/lx6464es/lx6464es.c')
-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;