diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-02 10:41:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-02 10:41:40 +0200 |
| commit | a3ea8e8f2474c35b4c3e22262991afddb93c4c0e (patch) | |
| tree | 648bbeea304950d02e71863673be8154a5e491f6 /sound/pci/sis7019.c | |
| parent | c2de187e5b0f25b572ac1cb6cdf383f16123717d (diff) | |
| parent | ebb47241ea0eac6a5a23404821a2d62f64c68496 (diff) | |
| download | kernel_samsung_tuna-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.zip kernel_samsung_tuna-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.gz kernel_samsung_tuna-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.bz2 | |
Merge branch 'fix/hda' into topic/hda
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 1b8f674..2b5c7a95 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c @@ -308,7 +308,7 @@ static irqreturn_t sis_interrupt(int irq, void *dev) u32 intr, status; /* We only use the DMA interrupts, and we don't enable any other - * source of interrupts. But, it is possible to see an interupt + * source of interrupts. But, it is possible to see an interrupt * status that didn't actually interrupt us, so eliminate anything * we're not expecting to avoid falsely claiming an IRQ, and an * ensuing endless loop. @@ -773,7 +773,7 @@ static void sis_prepare_timing_voice(struct voice *voice, vperiod = 0; } - /* The interrupt handler implements the timing syncronization, so + /* The interrupt handler implements the timing synchronization, so * setup its state. */ timing->flags |= VOICE_SYNC_TIMING; @@ -1139,7 +1139,7 @@ static int sis_chip_init(struct sis7019 *sis) */ outl(SIS_DMA_CSR_PCI_SETTINGS, io + SIS_DMA_CSR); - /* Reset the syncronization groups for all of the channels + /* Reset the synchronization groups for all of the channels * to be asyncronous. If we start doing SPDIF or 5.1 sound, etc. * we'll need to change how we handle these. Until then, we just * assign sub-mixer 0 to all playback channels, and avoid any |