From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 17:39:32 +0000 (+0200)
Subject: pcm: remove extra NULL checks in snd_pcm_dsnoop_open()
X-Git-Tag: android-x86-8.1-r6~23
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=01a45aec6fcd5a5378a5b5e0ae0f9dacde2068e4;p=android-x86%2Fexternal-alsa-lib.git

pcm: remove extra NULL checks in snd_pcm_dsnoop_open()

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
index fb1b02c2..2c3b9f43 100644
--- a/src/pcm/pcm_dsnoop.c
+++ b/src/pcm/pcm_dsnoop.c
@@ -564,8 +564,8 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
 			snd_config_t *root, snd_config_t *sconf,
 			snd_pcm_stream_t stream, int mode)
 {
-	snd_pcm_t *pcm = NULL, *spcm = NULL;
-	snd_pcm_direct_t *dsnoop = NULL;
+	snd_pcm_t *pcm, *spcm = NULL;
+	snd_pcm_direct_t *dsnoop;
 	int ret, first_instance;
 
 	assert(pcmp);
@@ -708,12 +708,9 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
 		snd_pcm_direct_semaphore_up(dsnoop, DIRECT_IPC_SEM_CLIENT);
 
  _err_nosem:
-	if (dsnoop) {
-		free(dsnoop->bindings);
-		free(dsnoop);
-	}
-	if (pcm)
-		snd_pcm_free(pcm);
+	free(dsnoop->bindings);
+	free(dsnoop);
+	snd_pcm_free(pcm);
 	return ret;
 }