]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ALSA: pcm: Avoid double hw_free calls at releasing a stream
authorTakashi Iwai <tiwai@suse.de>
Tue, 29 Sep 2015 10:57:42 +0000 (12:57 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 29 Sep 2015 10:57:42 +0000 (12:57 +0200)
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>
sound/core/pcm_native.c

index 4863af5e7b26638961aeda05f6595e99e0bdd604..139887011ba2c4b387050e5a041878d4e4f09c84 100644 (file)
@@ -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;