diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /drivers/sound/soundcard.c | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'drivers/sound/soundcard.c')
| -rw-r--r-- | drivers/sound/soundcard.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/sound/soundcard.c b/drivers/sound/soundcard.c index 97d05c93b..43c7ad8a6 100644 --- a/drivers/sound/soundcard.c +++ b/drivers/sound/soundcard.c @@ -152,7 +152,7 @@ static int get_mixer_levels(caddr_t arg) return 0; } -static int sound_proc_get_info(char *buffer, char **start, off_t offset, int length, int inout) +static int sound_proc_get_info(char *buffer, char **start, off_t offset, int length) { int len, i, drv; off_t pos = 0; @@ -325,7 +325,7 @@ static ssize_t sndstat_file_read(struct file * file, char * buf, size_t nbytes, count = MIN(PROC_BLOCK_SIZE, nbytes); start = NULL; - n = sound_proc_get_info(page, &start, *ppos, count, 0); + n = sound_proc_get_info(page, &start, *ppos, count); if (n < count) eof = 1; @@ -382,6 +382,7 @@ static ssize_t sound_read(struct file *file, char *buf, size_t count, loff_t *pp switch (dev & 0x0f) { case SND_DEV_STATUS: ret = sndstat_file_read(file, buf, count, ppos); + break; #ifdef CONFIG_AUDIO case SND_DEV_DSP: |