diff options
Diffstat (limited to 'sound/oss')
-rw-r--r-- | sound/oss/audio.c | 2 | ||||
-rw-r--r-- | sound/oss/midi_synth.c | 2 | ||||
-rw-r--r-- | sound/oss/mpu401.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/audio.c b/sound/oss/audio.c index b69c05b7ea7b..7df48a25c4ee 100644 --- a/sound/oss/audio.c +++ b/sound/oss/audio.c | |||
@@ -838,7 +838,7 @@ static int dma_ioctl(int dev, unsigned int cmd, void __user *arg) | |||
838 | if ((err = audio_devs[dev]->d->prepare_for_input(dev, | 838 | if ((err = audio_devs[dev]->d->prepare_for_input(dev, |
839 | dmap_in->fragment_size, dmap_in->nbufs)) < 0) { | 839 | dmap_in->fragment_size, dmap_in->nbufs)) < 0) { |
840 | spin_unlock_irqrestore(&dmap_in->lock,flags); | 840 | spin_unlock_irqrestore(&dmap_in->lock,flags); |
841 | return -err; | 841 | return err; |
842 | } | 842 | } |
843 | dmap_in->dma_mode = DMODE_INPUT; | 843 | dmap_in->dma_mode = DMODE_INPUT; |
844 | audio_devs[dev]->enable_bits |= PCM_ENABLE_INPUT; | 844 | audio_devs[dev]->enable_bits |= PCM_ENABLE_INPUT; |
diff --git a/sound/oss/midi_synth.c b/sound/oss/midi_synth.c index 9e450988ed36..3bc7104c5379 100644 --- a/sound/oss/midi_synth.c +++ b/sound/oss/midi_synth.c | |||
@@ -426,7 +426,7 @@ midi_synth_open(int dev, int mode) | |||
426 | int err; | 426 | int err; |
427 | struct midi_input_info *inc; | 427 | struct midi_input_info *inc; |
428 | 428 | ||
429 | if (orig_dev < 0 || orig_dev > num_midis || midi_devs[orig_dev] == NULL) | 429 | if (orig_dev < 0 || orig_dev >= num_midis || midi_devs[orig_dev] == NULL) |
430 | return -ENXIO; | 430 | return -ENXIO; |
431 | 431 | ||
432 | midi2synth[orig_dev] = dev; | 432 | midi2synth[orig_dev] = dev; |
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c index 734b8f9e2f78..0af9d24feb8f 100644 --- a/sound/oss/mpu401.c +++ b/sound/oss/mpu401.c | |||
@@ -770,7 +770,7 @@ static int mpu_synth_ioctl(int dev, unsigned int cmd, void __user *arg) | |||
770 | 770 | ||
771 | midi_dev = synth_devs[dev]->midi_dev; | 771 | midi_dev = synth_devs[dev]->midi_dev; |
772 | 772 | ||
773 | if (midi_dev < 0 || midi_dev > num_midis || midi_devs[midi_dev] == NULL) | 773 | if (midi_dev < 0 || midi_dev >= num_midis || midi_devs[midi_dev] == NULL) |
774 | return -ENXIO; | 774 | return -ENXIO; |
775 | 775 | ||
776 | devc = &dev_conf[midi_dev]; | 776 | devc = &dev_conf[midi_dev]; |