diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-09-15 16:32:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-15 16:32:31 +0200 |
| commit | e5d6db8e6039d7f51a9a648d74db1109c7fdc746 (patch) | |
| tree | 1f8ec13b6bda70fdf6c607a86d02c3e974e4c469 /sound/core/pcm.c | |
| parent | 62cbde1868b16e7cf1ed115cdfb9cbe82e230f0a (diff) | |
| parent | 5efbc2610a7b2aac6c51f8fc943c019106568939 (diff) | |
| download | op-kernel-dev-e5d6db8e6039d7f51a9a648d74db1109c7fdc746.zip op-kernel-dev-e5d6db8e6039d7f51a9a648d74db1109c7fdc746.tar.gz | |
Merge branch 'topic/tlv-chmap' into for-next
This is a merge of a topic branch containing the support for the new
channel map API using control elements.
Diffstat (limited to 'sound/core/pcm.c')
| -rw-r--r-- | sound/core/pcm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 1a3070b..f299194 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -1105,6 +1105,10 @@ static int snd_pcm_dev_disconnect(struct snd_device *device) break; } snd_unregister_device(devtype, pcm->card, pcm->device); + if (pcm->streams[cidx].chmap_kctl) { + snd_ctl_remove(pcm->card, pcm->streams[cidx].chmap_kctl); + pcm->streams[cidx].chmap_kctl = NULL; + } } unlock: mutex_unlock(®ister_mutex); |
