diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-02-27 17:43:19 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-03-03 11:26:24 +0100 |
commit | bbbc7e8502c95237dbd86cc4d0a12ca9a6b18c8f (patch) | |
tree | 71d5973b321c194ca5b9fd76592844eb37c4c9ed /sound/pci/hda/hda_proc.c | |
parent | f4de8fe6cffb449a779dff61f071bd1af9e18e0f (diff) | |
download | op-kernel-dev-bbbc7e8502c95237dbd86cc4d0a12ca9a6b18c8f.zip op-kernel-dev-bbbc7e8502c95237dbd86cc4d0a12ca9a6b18c8f.tar.gz |
ALSA: hda - Allocate hda_pcm objects dynamically
So far, the hda_codec object kept the hda_pcm list in an array, and
the codec driver was expected to assign the array. However, this
makes the object life cycle management harder, because the assigned
array is freed at the codec driver detach while it might be still
accessed by the opened streams.
In this patch, we allocate each hda_pcm object dynamically and manage
it as a linked list. Each object has a kref refcount, and both the
codec driver binder and the PCM open/close touches it, so that the
object won't be freed while in use.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_proc.c')
-rw-r--r-- | sound/pci/hda/hda_proc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index cc32b87..aeb983e 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -99,10 +99,10 @@ static void print_nid_array(struct snd_info_buffer *buffer, static void print_nid_pcms(struct snd_info_buffer *buffer, struct hda_codec *codec, hda_nid_t nid) { - int pcm, type; + int type; struct hda_pcm *cpcm; - for (pcm = 0; pcm < codec->num_pcms; pcm++) { - cpcm = &codec->pcm_info[pcm]; + + list_for_each_entry(cpcm, &codec->pcm_list_head, list) { for (type = 0; type < 2; type++) { if (cpcm->stream[type].nid != nid || cpcm->pcm == NULL) continue; |