diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
| commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
| tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /drivers/sound/audio.c | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'drivers/sound/audio.c')
| -rw-r--r-- | drivers/sound/audio.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/sound/audio.c b/drivers/sound/audio.c index 605a03ba5..ac2b6d40a 100644 --- a/drivers/sound/audio.c +++ b/drivers/sound/audio.c @@ -60,7 +60,10 @@ static int set_format(int dev, int fmt) else return audio_devs[dev]->local_format; - return audio_devs[dev]->local_format; + if (audio_devs[dev]->local_conversion) + return audio_devs[dev]->local_conversion; + else + return audio_devs[dev]->local_format; } int audio_open(int dev, struct file *file) @@ -387,7 +390,7 @@ int audio_ioctl(int dev, struct file *file, unsigned int cmd, caddr_t arg) return 0; case SNDCTL_DSP_GETFMTS: - val = audio_devs[dev]->format_mask; + val = audio_devs[dev]->format_mask | AFMT_MU_LAW; break; case SNDCTL_DSP_SETFMT: |