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

[ALSA] ALSA's struct _snd_pcm_substream: Obsolete open_flag

Browse Source 
PCM Midlevel,ALSA<-OSS emulation,USB USX2Y
This patch removes open_flag from struct _snd_pcm_substream.
All of its uses are substituted by querying struct _snd_pcm_substream's
member ffile instead.

Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Karsten Wiese
2005-08-10 11:18:19 +02:00
committed by Jaroslav Kysela
parent 9bcf655109
commit 443feb8826
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sound/core/pcm_native.c
View File

@ -1967,13 +1967,12 @@ static int snd_pcm_release_file(snd_pcm_file_t * pcm_file)
runtime = substream->runtime;
str = substream->pstr;
snd_pcm_unlink(substream);
if (substream->open_flag) {
if (substream->ffile != NULL) {
if (substream->ops->hw_free != NULL)
substream->ops->hw_free(substream);
substream->ops->close(substream);
substream->open_flag = 0;
substream->ffile = NULL;
}
substream->ffile = NULL;
snd_pcm_remove_file(str, pcm_file);
snd_pcm_release_substream(substream);
kfree(pcm_file);
@ -2022,18 +2021,15 @@ static int snd_pcm_open_file(struct file *file,
snd_pcm_release_file(pcm_file);
return err;
}
substream->open_flag = 1;
substream->ffile = file;
err = snd_pcm_hw_constraints_complete(substream);
if (err < 0) {
snd_printd("snd_pcm_hw_constraints_complete failed\n");
substream->ops->close(substream);
snd_pcm_release_file(pcm_file);
return err;
}
substream->ffile = file;
file->private_data = pcm_file;
*rpcm_file = pcm_file;
return 0;