diff options
Diffstat (limited to 'sound/oss')
-rw-r--r-- | sound/oss/ac97_codec.c | 6 | ||||
-rw-r--r-- | sound/oss/audio.c | 4 | ||||
-rw-r--r-- | sound/oss/dmasound/dmasound_core.c | 2 | ||||
-rw-r--r-- | sound/oss/midibuf.c | 2 | ||||
-rw-r--r-- | sound/oss/sb_card.c | 2 | ||||
-rw-r--r-- | sound/oss/sb_ess.c | 2 | ||||
-rw-r--r-- | sound/oss/swarm_cs4297a.c | 2 | ||||
-rw-r--r-- | sound/oss/vidc.c | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c index 854c303264dc..0cd23d94888f 100644 --- a/sound/oss/ac97_codec.c +++ b/sound/oss/ac97_codec.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * | 28 | * |
29 | * History | 29 | * History |
30 | * May 02, 2003 Liam Girdwood <lrg@slimlogic.co.uk> | 30 | * May 02, 2003 Liam Girdwood <lrg@slimlogic.co.uk> |
31 | * Removed non existant WM9700 | 31 | * Removed non existent WM9700 |
32 | * Added support for WM9705, WM9708, WM9709, WM9710, WM9711 | 32 | * Added support for WM9705, WM9708, WM9709, WM9710, WM9711 |
33 | * WM9712 and WM9717 | 33 | * WM9712 and WM9717 |
34 | * Mar 28, 2002 Randolph Bentson <bentson@holmsjoen.com> | 34 | * Mar 28, 2002 Randolph Bentson <bentson@holmsjoen.com> |
@@ -441,7 +441,7 @@ static void ac97_set_mixer(struct ac97_codec *codec, unsigned int oss_mixer, uns | |||
441 | } | 441 | } |
442 | 442 | ||
443 | /* read or write the recmask, the ac97 can really have left and right recording | 443 | /* read or write the recmask, the ac97 can really have left and right recording |
444 | inputs independantly set, but OSS doesn't seem to want us to express that to | 444 | inputs independently set, but OSS doesn't seem to want us to express that to |
445 | the user. the caller guarantees that we have a supported bit set, and they | 445 | the user. the caller guarantees that we have a supported bit set, and they |
446 | must be holding the card's spinlock */ | 446 | must be holding the card's spinlock */ |
447 | static int ac97_recmask_io(struct ac97_codec *codec, int rw, int mask) | 447 | static int ac97_recmask_io(struct ac97_codec *codec, int rw, int mask) |
@@ -754,7 +754,7 @@ int ac97_probe_codec(struct ac97_codec *codec) | |||
754 | if((codec->codec_ops == &null_ops) && (f & 4)) | 754 | if((codec->codec_ops == &null_ops) && (f & 4)) |
755 | codec->codec_ops = &default_digital_ops; | 755 | codec->codec_ops = &default_digital_ops; |
756 | 756 | ||
757 | /* A device which thinks its a modem but isnt */ | 757 | /* A device which thinks its a modem but isn't */ |
758 | if(codec->flags & AC97_DELUDED_MODEM) | 758 | if(codec->flags & AC97_DELUDED_MODEM) |
759 | codec->modem = 0; | 759 | codec->modem = 0; |
760 | 760 | ||
diff --git a/sound/oss/audio.c b/sound/oss/audio.c index 7df48a25c4ee..4b958b1c497c 100644 --- a/sound/oss/audio.c +++ b/sound/oss/audio.c | |||
@@ -514,7 +514,7 @@ int audio_ioctl(int dev, struct file *file, unsigned int cmd, void __user *arg) | |||
514 | count += dmap->bytes_in_use; /* Pointer wrap not handled yet */ | 514 | count += dmap->bytes_in_use; /* Pointer wrap not handled yet */ |
515 | count += dmap->byte_counter; | 515 | count += dmap->byte_counter; |
516 | 516 | ||
517 | /* Substract current count from the number of bytes written by app */ | 517 | /* Subtract current count from the number of bytes written by app */ |
518 | count = dmap->user_counter - count; | 518 | count = dmap->user_counter - count; |
519 | if (count < 0) | 519 | if (count < 0) |
520 | count = 0; | 520 | count = 0; |
@@ -931,7 +931,7 @@ static int dma_ioctl(int dev, unsigned int cmd, void __user *arg) | |||
931 | if (count < dmap_out->fragment_size && dmap_out->qhead != 0) | 931 | if (count < dmap_out->fragment_size && dmap_out->qhead != 0) |
932 | count += dmap_out->bytes_in_use; /* Pointer wrap not handled yet */ | 932 | count += dmap_out->bytes_in_use; /* Pointer wrap not handled yet */ |
933 | count += dmap_out->byte_counter; | 933 | count += dmap_out->byte_counter; |
934 | /* Substract current count from the number of bytes written by app */ | 934 | /* Subtract current count from the number of bytes written by app */ |
935 | count = dmap_out->user_counter - count; | 935 | count = dmap_out->user_counter - count; |
936 | if (count < 0) | 936 | if (count < 0) |
937 | count = 0; | 937 | count = 0; |
diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c index 87e2c72651f5..c918313c2206 100644 --- a/sound/oss/dmasound/dmasound_core.c +++ b/sound/oss/dmasound/dmasound_core.c | |||
@@ -1021,7 +1021,7 @@ static int sq_ioctl(struct file *file, u_int cmd, u_long arg) | |||
1021 | case SNDCTL_DSP_SYNC: | 1021 | case SNDCTL_DSP_SYNC: |
1022 | /* This call, effectively, has the same behaviour as SNDCTL_DSP_RESET | 1022 | /* This call, effectively, has the same behaviour as SNDCTL_DSP_RESET |
1023 | except that it waits for output to finish before resetting | 1023 | except that it waits for output to finish before resetting |
1024 | everything - read, however, is killed imediately. | 1024 | everything - read, however, is killed immediately. |
1025 | */ | 1025 | */ |
1026 | result = 0 ; | 1026 | result = 0 ; |
1027 | if (file->f_mode & FMODE_WRITE) { | 1027 | if (file->f_mode & FMODE_WRITE) { |
diff --git a/sound/oss/midibuf.c b/sound/oss/midibuf.c index ceedb1eff203..8cdb2cfe65c8 100644 --- a/sound/oss/midibuf.c +++ b/sound/oss/midibuf.c | |||
@@ -295,7 +295,7 @@ int MIDIbuf_write(int dev, struct file *file, const char __user *buf, int count) | |||
295 | 295 | ||
296 | for (i = 0; i < n; i++) | 296 | for (i = 0; i < n; i++) |
297 | { | 297 | { |
298 | /* BROKE BROKE BROKE - CANT DO THIS WITH CLI !! */ | 298 | /* BROKE BROKE BROKE - CAN'T DO THIS WITH CLI !! */ |
299 | /* yes, think the same, so I removed the cli() brackets | 299 | /* yes, think the same, so I removed the cli() brackets |
300 | QUEUE_BYTE is protected against interrupts */ | 300 | QUEUE_BYTE is protected against interrupts */ |
301 | if (copy_from_user((char *) &tmp_data, &(buf)[c], 1)) { | 301 | if (copy_from_user((char *) &tmp_data, &(buf)[c], 1)) { |
diff --git a/sound/oss/sb_card.c b/sound/oss/sb_card.c index 84ef4d06c1c2..fb5d7250de38 100644 --- a/sound/oss/sb_card.c +++ b/sound/oss/sb_card.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * sound/oss/sb_card.c | 2 | * sound/oss/sb_card.c |
3 | * | 3 | * |
4 | * Detection routine for the ISA Sound Blaster and compatable sound | 4 | * Detection routine for the ISA Sound Blaster and compatible sound |
5 | * cards. | 5 | * cards. |
6 | * | 6 | * |
7 | * This file is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) | 7 | * This file is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) |
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c index 9890cf2066ff..5c773dff5ac5 100644 --- a/sound/oss/sb_ess.c +++ b/sound/oss/sb_ess.c | |||
@@ -168,7 +168,7 @@ | |||
168 | * corresponding playback levels, unless recmask says they aren't recorded. In | 168 | * corresponding playback levels, unless recmask says they aren't recorded. In |
169 | * the latter case the recording volumes are 0. | 169 | * the latter case the recording volumes are 0. |
170 | * Now recording levels of inputs can be controlled, by changing the playback | 170 | * Now recording levels of inputs can be controlled, by changing the playback |
171 | * levels. Futhermore several devices can be recorded together (which is not | 171 | * levels. Furthermore several devices can be recorded together (which is not |
172 | * possible with the ES1688). | 172 | * possible with the ES1688). |
173 | * Besides the separate recording level control for each input, the common | 173 | * Besides the separate recording level control for each input, the common |
174 | * recording level can also be controlled by RECLEV as described above. | 174 | * recording level can also be controlled by RECLEV as described above. |
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c index 44357d877a27..09d46484bc1a 100644 --- a/sound/oss/swarm_cs4297a.c +++ b/sound/oss/swarm_cs4297a.c | |||
@@ -875,7 +875,7 @@ static void start_adc(struct cs4297a_state *s) | |||
875 | if (s->prop_adc.fmt & AFMT_S8 || s->prop_adc.fmt & AFMT_U8) { | 875 | if (s->prop_adc.fmt & AFMT_S8 || s->prop_adc.fmt & AFMT_U8) { |
876 | // | 876 | // |
877 | // now only use 16 bit capture, due to truncation issue | 877 | // now only use 16 bit capture, due to truncation issue |
878 | // in the chip, noticable distortion occurs. | 878 | // in the chip, noticeable distortion occurs. |
879 | // allocate buffer and then convert from 16 bit to | 879 | // allocate buffer and then convert from 16 bit to |
880 | // 8 bit for the user buffer. | 880 | // 8 bit for the user buffer. |
881 | // | 881 | // |
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index f0e0caa53200..12ba28e7b933 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c | |||
@@ -227,7 +227,7 @@ static int vidc_audio_set_speed(int dev, int rate) | |||
227 | } else { | 227 | } else { |
228 | /*printk("VIDC: internal %d %d %d\n", rate, rate_int, hwrate);*/ | 228 | /*printk("VIDC: internal %d %d %d\n", rate, rate_int, hwrate);*/ |
229 | hwctrl=0x00000003; | 229 | hwctrl=0x00000003; |
230 | /* Allow rougly 0.4% tolerance */ | 230 | /* Allow roughly 0.4% tolerance */ |
231 | if (diff_int > (rate/256)) | 231 | if (diff_int > (rate/256)) |
232 | rate=rate_int; | 232 | rate=rate_int; |
233 | } | 233 | } |