File 0030-PCM-Fix-the-invalid-snd_pcm_close-calls-in... of Package alsa

Overview Repositories Revisions Requests Users Attributes Meta

File 0030-PCM-Fix-the-invalid-snd_pcm_close-calls-in-rate-plug.patch of Package alsa (Revision 0de663a185cf6297b35088c3ec594eb0)

Currently displaying revision 0de663a185cf6297b35088c3ec594eb0 , Show latest

From 4bdb09126a32feb4394eaeb1d400d87e7c968770 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 10 Oct 2012 10:22:54 +0200
Subject: [PATCH 30/30] PCM: Fix the invalid snd_pcm_close() calls in rate
 plugin

It happens in the error path, should call snd_pcm_free() instead.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 src/pcm/pcm_rate.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/src/pcm/pcm_rate.c
+++ b/src/pcm/pcm_rate.c
@@ -1394,13 +1394,13 @@ int snd_pcm_rate_open(snd_pcm_t **pcmp,
 		}
 	} else {
 		SNDERR("Invalid type for rate converter");
-		snd_pcm_close(pcm);
+		snd_pcm_free(pcm);
 		free(rate);
 		return -EINVAL;
 	}
 	if (err < 0) {
 		SNDERR("Cannot find rate converter");
-		snd_pcm_close(pcm);
+		snd_pcm_free(pcm);
 		free(rate);
 		return -ENOENT;
 	}
@@ -1409,7 +1409,7 @@ int snd_pcm_rate_open(snd_pcm_t **pcmp,
 	open_func = SND_PCM_RATE_PLUGIN_ENTRY(linear);
 	err = open_func(SND_PCM_RATE_PLUGIN_VERSION, &rate->obj, &rate->ops);
 	if (err < 0) {
-		snd_pcm_close(pcm);
+		snd_pcm_free(pcm);
 		free(rate);
 		return err;
 	}
@@ -1418,7 +1418,7 @@ int snd_pcm_rate_open(snd_pcm_t **pcmp,
 	if (! rate->ops.init || ! (rate->ops.convert || rate->ops.convert_s16) ||
 	    ! rate->ops.input_frames || ! rate->ops.output_frames) {
 		SNDERR("Inproper rate plugin %s initialization", type);
-		snd_pcm_close(pcm);
+		snd_pcm_free(pcm);
 		free(rate);
 		return err;
 	}

Places

File 0030-PCM-Fix-the-invalid-snd_pcm_close-calls-in-rate-plug.patch of Package alsa (Revision 0de663a185cf6297b35088c3ec594eb0)

Places