adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

sound: vwsnd: Fix setting of cfgval and ctlval in li_setup_dma()

Browse source 
Since !LI_CCFG_* evaluates to 0, this did not change anything to
cfgval and ctlval.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Roel Kluin 2009-08-26 12:01:20 +02:00 committed by Takashi Iwai
parent 5e8e7c3853
commit f1d269bac2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/oss/vwsnd.c
View file

@ -628,7 +628,7 @@ static void li_setup_dma(dma_chan_t *chan,
ASSERT(!(buffer_paddr & 0xFF)); ASSERT(!(buffer_paddr & 0xFF));
chan->baseval = (buffer_paddr >> 8) | 1 << (37 - 8); chan->baseval = (buffer_paddr >> 8) | 1 << (37 - 8);
chan->cfgval = (!LI_CCFG_LOCK | chan->cfgval = ((chan->cfgval & ~LI_CCFG_LOCK) |
SHIFT_FIELD(desc->ad1843_slot, LI_CCFG_SLOT) | SHIFT_FIELD(desc->ad1843_slot, LI_CCFG_SLOT) |
desc->direction | desc->direction |
mode | mode |
@ -638,9 +638,9 @@ static void li_setup_dma(dma_chan_t *chan,
tmask = 13 - fragshift; /* See Lithium DMA Notes above. */ tmask = 13 - fragshift; /* See Lithium DMA Notes above. */
ASSERT(size >= 2 && size <= 7); ASSERT(size >= 2 && size <= 7);
ASSERT(tmask >= 1 && tmask <= 7); ASSERT(tmask >= 1 && tmask <= 7);
chan->ctlval = (!LI_CCTL_RESET | chan->ctlval = ((chan->ctlval & ~LI_CCTL_RESET) |
SHIFT_FIELD(size, LI_CCTL_SIZE) | SHIFT_FIELD(size, LI_CCTL_SIZE) |
!LI_CCTL_DMA_ENABLE | (chan->ctlval & ~LI_CCTL_DMA_ENABLE) |
SHIFT_FIELD(tmask, LI_CCTL_TMASK) | SHIFT_FIELD(tmask, LI_CCTL_TMASK) |
SHIFT_FIELD(0, LI_CCTL_TPTR)); SHIFT_FIELD(0, LI_CCTL_TPTR));