diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/sound/vidc_mixer.c | |
parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/sound/vidc_mixer.c')
-rw-r--r-- | drivers/sound/vidc_mixer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/sound/vidc_mixer.c b/drivers/sound/vidc_mixer.c index 1bdb1e88e..01be4925c 100644 --- a/drivers/sound/vidc_mixer.c +++ b/drivers/sound/vidc_mixer.c @@ -47,13 +47,15 @@ static int vidc_default_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg) break; case SOUND_MIXER_READ_SYNTH: - ret = vidc_synth_get_volume(); +// ret = vidc_synth_get_volume(); + ret = 0; break; case SOUND_MIXER_WRITE_SYNTH: if (get_user(ret, (int *) arg)) return -EINVAL; - ret = vidc_synth_set_volume(ret); +// ret = vidc_synth_set_volume(ret); + ret = 0; break; case SOUND_MIXER_READ_PCM: |