aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/cs5535audio/cs5535audio_pcm.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 16:33:14 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 16:33:14 -0400
commitda206c9e68cb93fcab43592d46276c02889c1250 (patch)
tree21264cc26fa0322d668b398808f10bd93558d25f /sound/pci/cs5535audio/cs5535audio_pcm.c
parent916d15445f4ad2a9018e5451760734f36083be77 (diff)
parent2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: typo fixes Clean up 'inline is not at beginning' warnings for usb storage Storage class should be first i386: Trivial typo fixes ixj: make ixj_set_tone_off() static spelling fixes fix paniced->panicked typos Spelling fixes for Documentation/atomic_ops.txt move acknowledgment for Mark Adler to CREDITS remove the bouncing email address of David Campbell
Diffstat (limited to 'sound/pci/cs5535audio/cs5535audio_pcm.c')
-rw-r--r--sound/pci/cs5535audio/cs5535audio_pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c
index f0a48693d687..5450a9e8f133 100644
--- a/sound/pci/cs5535audio/cs5535audio_pcm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pcm.c
@@ -143,7 +143,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au,
143 if (dma->periods == periods && dma->period_bytes == period_bytes) 143 if (dma->periods == periods && dma->period_bytes == period_bytes)
144 return 0; 144 return 0;
145 145
146 /* the u32 cast is okay because in snd*create we succesfully told 146 /* the u32 cast is okay because in snd*create we successfully told
147 pci alloc that we're only 32 bit capable so the uppper will be 0 */ 147 pci alloc that we're only 32 bit capable so the uppper will be 0 */
148 addr = (u32) substream->runtime->dma_addr; 148 addr = (u32) substream->runtime->dma_addr;
149 desc_addr = (u32) dma->desc_buf.addr; 149 desc_addr = (u32) dma->desc_buf.addr;