lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: Fix SNDCTL_DSP_RESET ioctl for OSS emulation

Browse Source 
In OSS emulation, SNDCTL_DSP_RESET ioctl needs the reset of the internal
buffer state in addition to drop of the running streams.  Otherwise the
succeeding access becomes inconsistent.

Tested-by: Amit Nagal <helloin.amit@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2010-11-30 08:14:21 +01:00
parent ac70eb1305
commit 60686aa008
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sound/core/oss/pcm_oss.c
View File

@@ -1510,16 +1510,19 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
static int snd_pcm_oss_reset(struct snd_pcm_oss_file *pcm_oss_file) static int snd_pcm_oss_reset(struct snd_pcm_oss_file *pcm_oss_file)
{ {
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
struct snd_pcm_runtime *runtime;
int i;
substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK]; for (i = 0; i < 2; i++) {
if (substream != NULL) { substream = pcm_oss_file->streams[i];
if (!substream)
continue;
runtime = substream->runtime;
snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL); snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);
substream->runtime->oss.prepare = 1; runtime->oss.prepare = 1;
} runtime->oss.buffer_used = 0;
substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_CAPTURE]; runtime->oss.prev_hw_ptr_period = 0;
if (substream != NULL) { runtime->oss.period_ptr = 0;
snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);
substream->runtime->oss.prepare = 1;
} }
return 0; return 0;
} }