Skip to content

Commit

Permalink
Merge branch 'fix/lx6464es' into for-linus
Browse files Browse the repository at this point in the history
* fix/lx6464es:
  ALSA: lx6464es - configure ethersound io channels
  • Loading branch information
Takashi Iwai committed Jun 29, 2009
2 parents cdae219 + 7e895cf commit 0baddbc
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions sound/pci/lx6464es/lx6464es.c
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 0baddbc

Please sign in to comment.