diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /sound/pci/sis7019.c | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'sound/pci/sis7019.c')
-rw-r--r-- | sound/pci/sis7019.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index 1b8f6742b5fa..2b5c7a95ae1f 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c | |||
@@ -308,7 +308,7 @@ static irqreturn_t sis_interrupt(int irq, void *dev) | |||
308 | u32 intr, status; | 308 | u32 intr, status; |
309 | 309 | ||
310 | /* We only use the DMA interrupts, and we don't enable any other | 310 | /* We only use the DMA interrupts, and we don't enable any other |
311 | * source of interrupts. But, it is possible to see an interupt | 311 | * source of interrupts. But, it is possible to see an interrupt |
312 | * status that didn't actually interrupt us, so eliminate anything | 312 | * status that didn't actually interrupt us, so eliminate anything |
313 | * we're not expecting to avoid falsely claiming an IRQ, and an | 313 | * we're not expecting to avoid falsely claiming an IRQ, and an |
314 | * ensuing endless loop. | 314 | * ensuing endless loop. |
@@ -773,7 +773,7 @@ static void sis_prepare_timing_voice(struct voice *voice, | |||
773 | vperiod = 0; | 773 | vperiod = 0; |
774 | } | 774 | } |
775 | 775 | ||
776 | /* The interrupt handler implements the timing syncronization, so | 776 | /* The interrupt handler implements the timing synchronization, so |
777 | * setup its state. | 777 | * setup its state. |
778 | */ | 778 | */ |
779 | timing->flags |= VOICE_SYNC_TIMING; | 779 | timing->flags |= VOICE_SYNC_TIMING; |
@@ -1139,7 +1139,7 @@ static int sis_chip_init(struct sis7019 *sis) | |||
1139 | */ | 1139 | */ |
1140 | outl(SIS_DMA_CSR_PCI_SETTINGS, io + SIS_DMA_CSR); | 1140 | outl(SIS_DMA_CSR_PCI_SETTINGS, io + SIS_DMA_CSR); |
1141 | 1141 | ||
1142 | /* Reset the syncronization groups for all of the channels | 1142 | /* Reset the synchronization groups for all of the channels |
1143 | * to be asyncronous. If we start doing SPDIF or 5.1 sound, etc. | 1143 | * to be asyncronous. If we start doing SPDIF or 5.1 sound, etc. |
1144 | * we'll need to change how we handle these. Until then, we just | 1144 | * we'll need to change how we handle these. Until then, we just |
1145 | * assign sub-mixer 0 to all playback channels, and avoid any | 1145 | * assign sub-mixer 0 to all playback channels, and avoid any |