diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /sound | |
parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/seq/seq_device.c | 2 | ||||
-rw-r--r-- | sound/pci/emu10k1/emu10k1_patch.c | 2 | ||||
-rw-r--r-- | sound/pci/es1968.c | 2 | ||||
-rw-r--r-- | sound/pci/ice1712/delta.c | 2 | ||||
-rw-r--r-- | sound/pci/sis7019.c | 2 | ||||
-rw-r--r-- | sound/usb/quirks.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c index 60e8fc1b344..040c60e1da2 100644 --- a/sound/core/seq/seq_device.c +++ b/sound/core/seq/seq_device.c | |||
@@ -66,7 +66,7 @@ struct ops_list { | |||
66 | /* operators */ | 66 | /* operators */ |
67 | struct snd_seq_dev_ops ops; | 67 | struct snd_seq_dev_ops ops; |
68 | 68 | ||
69 | /* registred devices */ | 69 | /* registered devices */ |
70 | struct list_head dev_list; /* list of devices */ | 70 | struct list_head dev_list; /* list of devices */ |
71 | int num_devices; /* number of associated devices */ | 71 | int num_devices; /* number of associated devices */ |
72 | int num_init_devices; /* number of initialized devices */ | 72 | int num_init_devices; /* number of initialized devices */ |
diff --git a/sound/pci/emu10k1/emu10k1_patch.c b/sound/pci/emu10k1/emu10k1_patch.c index e10f027bde0..662a45876a8 100644 --- a/sound/pci/emu10k1/emu10k1_patch.c +++ b/sound/pci/emu10k1/emu10k1_patch.c | |||
@@ -123,7 +123,7 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp, | |||
123 | offset += size; | 123 | offset += size; |
124 | data += size; | 124 | data += size; |
125 | 125 | ||
126 | #if 0 /* not suppported yet */ | 126 | #if 0 /* not supported yet */ |
127 | /* handle reverse (or bidirectional) loop */ | 127 | /* handle reverse (or bidirectional) loop */ |
128 | if (sp->v.mode_flags & (SNDRV_SFNT_SAMPLE_BIDIR_LOOP|SNDRV_SFNT_SAMPLE_REVERSE_LOOP)) { | 128 | if (sp->v.mode_flags & (SNDRV_SFNT_SAMPLE_BIDIR_LOOP|SNDRV_SFNT_SAMPLE_REVERSE_LOOP)) { |
129 | /* copy loop in reverse */ | 129 | /* copy loop in reverse */ |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 879db2d7796..a1f32b5ae0d 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -2291,7 +2291,7 @@ static void snd_es1968_chip_init(struct es1968 *chip) | |||
2291 | outb(0x88, iobase+0x1f); | 2291 | outb(0x88, iobase+0x1f); |
2292 | 2292 | ||
2293 | /* it appears some maestros (dell 7500) only work if these are set, | 2293 | /* it appears some maestros (dell 7500) only work if these are set, |
2294 | regardless of wether we use the assp or not. */ | 2294 | regardless of whether we use the assp or not. */ |
2295 | 2295 | ||
2296 | outb(0, iobase + ASSP_CONTROL_B); | 2296 | outb(0, iobase + ASSP_CONTROL_B); |
2297 | outb(3, iobase + ASSP_CONTROL_A); /* M: Reserved bits... */ | 2297 | outb(3, iobase + ASSP_CONTROL_A); /* M: Reserved bits... */ |
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c index ab2bca164d6..9e28cc12969 100644 --- a/sound/pci/ice1712/delta.c +++ b/sound/pci/ice1712/delta.c | |||
@@ -616,7 +616,7 @@ static int snd_ice1712_delta_init(struct snd_ice1712 *ice) | |||
616 | ice->num_total_dacs = 4; /* two AK4324 codecs */ | 616 | ice->num_total_dacs = 4; /* two AK4324 codecs */ |
617 | break; | 617 | break; |
618 | case ICE1712_SUBDEVICE_VX442: | 618 | case ICE1712_SUBDEVICE_VX442: |
619 | case ICE1712_SUBDEVICE_DELTA66E: /* omni not suported yet */ | 619 | case ICE1712_SUBDEVICE_DELTA66E: /* omni not supported yet */ |
620 | ice->num_total_dacs = 4; | 620 | ice->num_total_dacs = 4; |
621 | ice->num_total_adcs = 4; | 621 | ice->num_total_adcs = 4; |
622 | break; | 622 | break; |
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index 550b9cfb8e3..d59abe1682c 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c | |||
@@ -1171,7 +1171,7 @@ static int sis_chip_init(struct sis7019 *sis) | |||
1171 | outl(SIS_DMA_CSR_PCI_SETTINGS, io + SIS_DMA_CSR); | 1171 | outl(SIS_DMA_CSR_PCI_SETTINGS, io + SIS_DMA_CSR); |
1172 | 1172 | ||
1173 | /* Reset the synchronization groups for all of the channels | 1173 | /* Reset the synchronization groups for all of the channels |
1174 | * to be asyncronous. If we start doing SPDIF or 5.1 sound, etc. | 1174 | * to be asynchronous. If we start doing SPDIF or 5.1 sound, etc. |
1175 | * we'll need to change how we handle these. Until then, we just | 1175 | * we'll need to change how we handle these. Until then, we just |
1176 | * assign sub-mixer 0 to all playback channels, and avoid any | 1176 | * assign sub-mixer 0 to all playback channels, and avoid any |
1177 | * attenuation on the audio. | 1177 | * attenuation on the audio. |
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 0f58b4b6d70..007fcecdf5c 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c | |||
@@ -675,7 +675,7 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, | |||
675 | */ | 675 | */ |
676 | int snd_usb_is_big_endian_format(struct snd_usb_audio *chip, struct audioformat *fp) | 676 | int snd_usb_is_big_endian_format(struct snd_usb_audio *chip, struct audioformat *fp) |
677 | { | 677 | { |
678 | /* it depends on altsetting wether the device is big-endian or not */ | 678 | /* it depends on altsetting whether the device is big-endian or not */ |
679 | switch (chip->usb_id) { | 679 | switch (chip->usb_id) { |
680 | case USB_ID(0x0763, 0x2001): /* M-Audio Quattro: captured data only */ | 680 | case USB_ID(0x0763, 0x2001): /* M-Audio Quattro: captured data only */ |
681 | if (fp->altsetting == 2 || fp->altsetting == 3 || | 681 | if (fp->altsetting == 2 || fp->altsetting == 3 || |