diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-09-29 12:57:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-29 12:57:42 +0200 |
| commit | 094435d41df823dde850e193add57534a5b709c9 (patch) | |
| tree | 3689474c22c3a771007a2f3095d622affe36dfcc /sound/core/pcm_native.c | |
| parent | Merge branch 'topic/firewire-update' into for-next (diff) | |
| download | linux-094435d41df823dde850e193add57534a5b709c9.tar.xz linux-094435d41df823dde850e193add57534a5b709c9.zip | |
ALSA: pcm: Avoid double hw_free calls at releasing a stream
snd_pcm_release_substream() always calls hw_free op when the stream
was opened. This is superfluous in most cases because it's been
already released via explicit hw_free ioctl. Although this double
call is usually OK as this callback should be written to be called
multiple times, it's better to avoid superfluous calls.
Reported-by: Vinod Koul <vinod.koul@intel.com>
Tested-by: Jeeja Kp <jeeja.kp@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/pcm_native.c')
| -rw-r--r-- | sound/core/pcm_native.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 4863af5e7b26..139887011ba2 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -2227,7 +2227,8 @@ void snd_pcm_release_substream(struct snd_pcm_substream *substream) snd_pcm_drop(substream); if (substream->hw_opened) { - if (substream->ops->hw_free != NULL) + if (substream->ops->hw_free && + substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) substream->ops->hw_free(substream); substream->ops->close(substream); substream->hw_opened = 0; |