diff options
| author |  Takashi Iwai <tiwai@suse.de>
| 2010-10-11 13:45:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de>
| 2010-10-11 13:45:22 +0200 |
| commit | 4e83998f5af010a928495988c586ea2926624db9 (patch) | |
| tree | e72d346172a30bbee165d7f585784724906da416 /sound/core/pcm_native.c | |
| parent | ALSA: oxygen - Add a SSID for CMI8787-HG2PCI (diff) | |
| parent | OSS: soundcard: locking bug in sound_ioctl() (diff) | |
| download | linux-4e83998f5af010a928495988c586ea2926624db9.tar.gz linux-4e83998f5af010a928495988c586ea2926624db9.tar.bz2 linux-4e83998f5af010a928495988c586ea2926624db9.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/core/pcm_native.c')
| -rw-r--r-- | sound/core/pcm_native.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index eb4094270a4f..8bc7cb3db330 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1994,6 +1994,8 @@ void snd_pcm_release_substream(struct snd_pcm_substream *substream) substream->ops->close(substream); substream->hw_opened = 0; } + if (pm_qos_request_active(&substream->latency_pm_qos_req)) + pm_qos_remove_request(&substream->latency_pm_qos_req); if (substream->pcm_release) { substream->pcm_release(substream); substream->pcm_release = NULL; |