git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
sound
/
oss
/
vwsnd.c
diff --git
a/sound/oss/vwsnd.c
b/sound/oss/vwsnd.c
index
187f727
..
6713110
100644
(file)
--- a/
sound/oss/vwsnd.c
+++ b/
sound/oss/vwsnd.c
@@
-628,7
+628,7
@@
static void li_setup_dma(dma_chan_t *chan,
ASSERT(!(buffer_paddr & 0xFF));
chan->baseval = (buffer_paddr >> 8) | 1 << (37 - 8);
ASSERT(!(buffer_paddr & 0xFF));
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) |
desc->direction |
mode |
SHIFT_FIELD(desc->ad1843_slot, LI_CCFG_SLOT) |
desc->direction |
mode |
@@
-638,9
+638,9
@@
static void li_setup_dma(dma_chan_t *chan,
tmask = 13 - fragshift; /* See Lithium DMA Notes above. */
ASSERT(size >= 2 && size <= 7);
ASSERT(tmask >= 1 && tmask <= 7);
tmask = 13 - fragshift; /* See Lithium DMA Notes above. */
ASSERT(size >= 2 && size <= 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(0, LI_CCTL_TPTR));
SHIFT_FIELD(tmask, LI_CCTL_TMASK) |
SHIFT_FIELD(0, LI_CCTL_TPTR));